From a6045f6f201d66d380410fcbf1694d70e6d5cb5f Mon Sep 17 00:00:00 2001 From: Jesse Pretorius Date: Fri, 1 Jun 2018 14:37:45 +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 'cinder_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 cinder_galera_address which has been used for a long time, but never documented. Change-Id: I68bb4b288c3947685dbd512c58d73f23e84314e5 --- defaults/main.yml | 2 ++ examples/playbook.yml | 4 ++++ tasks/cinder_db_setup.yml | 26 ++++++++++++++++++++++++++ 3 files changed, 32 insertions(+) diff --git a/defaults/main.yml b/defaults/main.yml index 399a44b7..f2670c95 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -57,6 +57,8 @@ cinder_nova_catalog_admin_info: compute:nova:adminURL cinder_fatal_deprecations: False ## Database info +cinder_db_setup_host: "{{ ('galera_all' in groups) | ternary(groups['galera_all'][0], 'localhost') }}" +cinder_galera_address: "{{ galera_address | default('127.0.0.1') }}" cinder_galera_user: cinder cinder_galera_database: cinder cinder_galera_use_ssl: "{{ galera_use_ssl | default(False) }}" diff --git a/examples/playbook.yml b/examples/playbook.yml index 5abca460..f944864e 100644 --- a/examples/playbook.yml +++ b/examples/playbook.yml @@ -6,3 +6,7 @@ vars: cinder_glance_api_servers: "http://glance_server:9292" cinder_galera_address: "{{ internal_lb_vip_address }}" + galera_root_user: root + vars_prompt: + - name: "galera_root_password" + prompt: "What is galera_root_password?" diff --git a/tasks/cinder_db_setup.yml b/tasks/cinder_db_setup.yml index 81fab2b2..071763c0 100644 --- a/tasks/cinder_db_setup.yml +++ b/tasks/cinder_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: "{{ cinder_galera_address }}" + name: "{{ cinder_galera_database }}" + state: "present" + delegate_to: "{{ cinder_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: "{{ cinder_galera_address }}" + name: "{{ cinder_galera_user }}" + password: "{{ cinder_container_mysql_password }}" + host: "{{ item }}" + state: "present" + priv: "{{ cinder_galera_database }}.*:ALL" + delegate_to: "{{ cinder_db_setup_host }}" + with_items: + - "localhost" + - "%" + no_log: True + - name: Perform a cinder DB sync command: "{{ cinder_bin }}/cinder-manage db sync" become: yes