Move database creation into role

There is no record for why we implement the database creation outside
of the role in the playbook, when we could do it inside the role.

Implementing it inside the role allows us to reduce the quantity of
group_vars duplicated from the role, and allows us to better document
the required variables in the role. The delegation can still be done
as it is done in the playbook too.

In this patch we implement a new variable called 'octavia_db_setup_host'
which is used in the role to allow delegation of the database setup
task to any host, but defaults to the first member of the galera_all
host group. We also document the variable 'octavia_galera_address' which
has been used for a long time, but never documented. A bunch of unused
variables have also been removed.

Change-Id: I89a5a519e35058ad65ba3dbf31051e848894b35d
This commit is contained in:
Jesse Pretorius 2018-06-28 16:27:52 +01:00
parent 77020bde75
commit 21384bc4eb
3 changed files with 28 additions and 3 deletions

View File

@ -54,6 +54,8 @@ octavia_clients_endpoint: internalURL
octavia_auth_strategy: keystone
## Database info
octavia_db_setup_host: "{{ ('galera_all' in groups) | ternary(groups['galera_all'][0], 'localhost') }}"
octavia_galera_address: "{{ galera_address | default('127.0.0.1') }}"
octavia_galera_user: octavia
octavia_galera_database: octavia
octavia_galera_use_ssl: "{{ galera_use_ssl | default(False) }}"

View File

@ -13,6 +13,32 @@
# See the License for the specific language governing permissions and
# limitations under the License.
- name: Create DB for service
mysql_db:
login_user: "{{ galera_root_user }}"
login_password: "{{ galera_root_password }}"
login_host: "{{ octavia_galera_address }}"
name: "{{ octavia_galera_database }}"
state: "present"
delegate_to: "{{ octavia_db_setup_host }}"
no_log: True
- name: Grant access to the DB for the service
mysql_user:
login_user: "{{ galera_root_user }}"
login_password: "{{ galera_root_password }}"
login_host: "{{ octavia_galera_address }}"
name: "{{ octavia_galera_user }}"
password: "{{ octavia_container_mysql_password }}"
host: "{{ item }}"
state: "present"
priv: "{{ octavia_galera_database }}.*:ALL"
delegate_to: "{{ octavia_db_setup_host }}"
with_items:
- "localhost"
- "%"
no_log: True
# Update is offline
- name: Stop octavia services
service:

View File

@ -23,9 +23,6 @@
notify_vhost: "{{ octavia_oslomsg_notify_vhost }}"
notify_user: "{{ octavia_oslomsg_notify_userid }}"
notify_password: "{{ octavia_oslomsg_notify_password }}"
- include: common/create-grant-db.yml
db_name: "{{ octavia_galera_database }}"
db_password: "{{ octavia_container_mysql_password }}"
roles:
- role: "{{ octavia_rolename | default('os_octavia') }}"
vars_files: