From aa81c799f35ac7e5bd6cd515c8596a44297c79c8 Mon Sep 17 00:00:00 2001 From: Jesse Pretorius Date: Fri, 1 Jun 2018 15:28:16 +0100 Subject: [PATCH] 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 'heat_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 heat_galera_address which has been used for a long time, but never documented. Change-Id: I5f3e73af031aad455dbd8555aa054eac804a55bb --- defaults/main.yml | 2 ++ examples/playbook.yml | 4 ++++ tasks/heat_db_setup.yml | 26 ++++++++++++++++++++++++++ 3 files changed, 32 insertions(+) diff --git a/defaults/main.yml b/defaults/main.yml index 8b3a41b..3e92178 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -51,6 +51,8 @@ heat_clients_endpoint: internalURL heat_clients_heat_endpoint: publicURL ## Database info +heat_db_setup_host: "{{ ('galera_all' in groups) | ternary(groups['galera_all'][0], 'localhost') }}" +heat_galera_address: "{{ galera_address | default('127.0.0.1') }}" heat_galera_user: heat heat_galera_database: heat heat_galera_use_ssl: "{{ galera_use_ssl | default(False) }}" diff --git a/examples/playbook.yml b/examples/playbook.yml index fd8c941..f261405 100644 --- a/examples/playbook.yml +++ b/examples/playbook.yml @@ -9,3 +9,7 @@ heat_galera_address: "{{ internal_lb_vip_address }}" keystone_admin_user_name: admin keystone_admin_tenant_name: admin + galera_root_user: root + vars_prompt: + - name: "galera_root_password" + prompt: "What is galera_root_password?" diff --git a/tasks/heat_db_setup.yml b/tasks/heat_db_setup.yml index 50d454d..cbabb66 100644 --- a/tasks/heat_db_setup.yml +++ b/tasks/heat_db_setup.yml @@ -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: "{{ heat_galera_address }}" + name: "{{ heat_galera_database }}" + state: "present" + delegate_to: "{{ heat_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: "{{ heat_galera_address }}" + name: "{{ heat_galera_user }}" + password: "{{ heat_container_mysql_password }}" + host: "{{ item }}" + state: "present" + priv: "{{ heat_galera_database }}.*:ALL" + delegate_to: "{{ heat_db_setup_host }}" + with_items: + - "localhost" + - "%" + no_log: True + - name: Perform a heat DB sync command: "{{ heat_bin }}/heat-manage db_sync" become: yes