diff --git a/tasks/designate_db_setup.yml b/tasks/designate_db_setup.yml index a65adb1..e646a2f 100644 --- a/tasks/designate_db_setup.yml +++ b/tasks/designate_db_setup.yml @@ -13,58 +13,6 @@ # 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: "{{ designate_galera_address }}" - name: "{{ designate_galera_database }}" - state: "present" - tags: - - designate-db-setup - -- name: Grant access to the DB for the service - mysql_user: - login_user: "{{ galera_root_user }}" - login_password: "{{ galera_root_password }}" - login_host: "{{ designate_galera_address }}" - name: "{{ designate_galera_user }}" - password: "{{ designate_container_mysql_password }}" - host: "{{ item }}" - state: "present" - priv: "{{ designate_galera_database }}.*:ALL" - with_items: - - "localhost" - - "%" - tags: - - designate-db-setup - -- name: Create pool_manager DB for service - mysql_db: - login_user: "{{ galera_root_user }}" - login_password: "{{ galera_root_password }}" - login_host: "{{ designate_galera_address }}" - name: "{{ designate_pool_manager_galera_database }}" - state: "present" - tags: - - designate-db-setup - -- name: Grant access to the pool_manager DB for the service - mysql_user: - login_user: "{{ galera_root_user }}" - login_password: "{{ galera_root_password }}" - login_host: "{{ designate_galera_address }}" - name: "{{ designate_pool_manager_galera_user }}" - password: "{{ designate_pool_manager_container_mysql_password }}" - host: "{{ item }}" - state: "present" - priv: "{{ designate_pool_manager_galera_database }}.*:ALL" - with_items: - - "localhost" - - "%" - tags: - - designate-db-setup - - name: Perform a Designate DB sync command: "{{ designate_bin }}/designate-manage database sync" become: yes diff --git a/tasks/designate_messaging_setup.yml b/tasks/designate_messaging_setup.yml deleted file mode 100644 index 633e133..0000000 --- a/tasks/designate_messaging_setup.yml +++ /dev/null @@ -1,37 +0,0 @@ ---- -# Copyright 2016, Tata Consultancy Services -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -- name: Ensure Rabbitmq vhost - rabbitmq_vhost: - name: "{{ designate_rabbitmq_vhost }}" - state: "present" - delegate_to: "{{ groups['rabbitmq_all'][0] }}" - tags: - - designate-rabbitmq - - designate-rabbitmq-vhost - -- name: Ensure rabbitmq user - rabbitmq_user: - user: "{{ designate_rabbitmq_userid }}" - password: "{{ designate_rabbitmq_password }}" - vhost: "{{ designate_rabbitmq_vhost }}" - configure_priv: ".*" - read_priv: ".*" - write_priv: ".*" - state: "present" - delegate_to: "{{ groups['rabbitmq_all'][0] }}" - tags: - - designate-rabbitmq - - designate-rabbitmq-user diff --git a/tasks/designate_pre_install.yml b/tasks/designate_pre_install.yml index e784d09..bcad12c 100644 --- a/tasks/designate_pre_install.yml +++ b/tasks/designate_pre_install.yml @@ -101,7 +101,3 @@ tags: - sudoers - designate-sudoers - -- include: designate_messaging_setup.yml - when: - - inventory_hostname == groups['designate_all'][0] diff --git a/tests/test-install-designate.yml b/tests/test-install-designate.yml index 002f269..dd7ff2e 100644 --- a/tests/test-install-designate.yml +++ b/tests/test-install-designate.yml @@ -24,6 +24,70 @@ hosts: designate_all user: root gather_facts: true + pre_tasks: + - name: Ensure rabbitmq vhost + rabbitmq_vhost: + name: "{{ designate_rabbitmq_vhost }}" + state: "present" + delegate_to: "10.100.100.101" + when: inventory_hostname == groups['designate_all'][0] + - name: Ensure rabbitmq user + rabbitmq_user: + user: "{{ designate_rabbitmq_userid }}" + password: "{{ designate_rabbitmq_password }}" + vhost: "{{ designate_rabbitmq_vhost }}" + configure_priv: ".*" + read_priv: ".*" + write_priv: ".*" + state: "present" + delegate_to: "10.100.100.101" + when: inventory_hostname == groups['designate_all'][0] + - name: Create DB for service + mysql_db: + login_user: "{{ galera_root_user }}" + login_password: "{{ galera_root_password }}" + login_host: "localhost" + name: "{{ designate_galera_database }}" + state: "present" + delegate_to: "10.100.100.101" + when: inventory_hostname == groups['designate_all'][0] + - name: Grant access to the DB for the service + mysql_user: + login_user: "{{ galera_root_user }}" + login_password: "{{ galera_root_password }}" + login_host: "localhost" + name: "{{ designate_galera_user }}" + password: "{{ designate_container_mysql_password }}" + host: "{{ item }}" + state: "present" + priv: "{{ designate_galera_database }}.*:ALL" + with_items: + - "localhost" + - "%" + delegate_to: "10.100.100.101" + when: inventory_hostname == groups['designate_all'][0] + - name: Create pool_manager DB for service + mysql_db: + login_user: "{{ galera_root_user }}" + login_password: "{{ galera_root_password }}" + login_host: "{{ designate_galera_address }}" + name: "{{ designate_pool_manager_galera_database }}" + state: "present" + delegate_to: "10.100.100.101" + - name: Grant access to the pool_manager DB for the service + mysql_user: + login_user: "{{ galera_root_user }}" + login_password: "{{ galera_root_password }}" + login_host: "{{ designate_galera_address }}" + name: "{{ designate_pool_manager_galera_user }}" + password: "{{ designate_pool_manager_container_mysql_password }}" + host: "{{ item }}" + state: "present" + priv: "{{ designate_pool_manager_galera_database }}.*:ALL" + with_items: + - "localhost" + - "%" + delegate_to: "10.100.100.101" roles: - role: "{{ rolename | basename }}" vars_files: diff --git a/tests/test-install-keystone.yml b/tests/test-install-keystone.yml index 6b717e1..6bd946b 100644 --- a/tests/test-install-keystone.yml +++ b/tests/test-install-keystone.yml @@ -44,8 +44,8 @@ when: inventory_hostname == groups['keystone_all'][0] - name: Create DB for service mysql_db: - login_user: "root" - login_password: "secrete" + login_user: "{{ galera_root_user }}" + login_password: "{{ galera_root_password }}" login_host: "localhost" name: "{{ keystone_galera_database }}" state: "present" @@ -53,10 +53,10 @@ when: inventory_hostname == groups['keystone_all'][0] - name: Grant access to the DB for the service mysql_user: - login_user: "root" - login_password: "secrete" + login_user: "{{ galera_root_user }}" + login_password: "{{ galera_root_password }}" login_host: "localhost" - name: "{{ keystone_galera_database }}" + name: "{{ keystone_galera_user }}" password: "{{ keystone_container_mysql_password }}" host: "{{ item }}" state: "present" diff --git a/tests/test-vars.yml b/tests/test-vars.yml index e33e55b..e058e69 100644 --- a/tests/test-vars.yml +++ b/tests/test-vars.yml @@ -17,6 +17,7 @@ debug: True external_lb_vip_address: 10.100.100.102 internal_lb_vip_address: 10.100.100.102 galera_client_drop_config_file: false +galera_root_user: root galera_root_password: "secrete" rabbitmq_servers: 10.100.100.101 rabbitmq_use_ssl: False @@ -30,6 +31,7 @@ keystone_requirements_git_install_branch: 332278d456e06870150835564342570ec9d5f5 keystone_service_password: "secrete" keystone_galera_address: 10.100.100.101 keystone_galera_database: keystone +keystone_galera_user: keystone keystone_container_mysql_password: "SuperSecrete" keystone_auth_admin_token: "SuperSecreteTestToken" keystone_admin_user_name: admin @@ -56,8 +58,12 @@ designate_git_install_branch: 4df88d7b28a05cb3556573ce4f1c7c66abf944bb # HEAD of designate_requirements_git_install_branch: 332278d456e06870150835564342570ec9d5f5a0 # HEAD of "master" as of 17.01.2016 designate_service_password: "secrete" designate_galera_address: 10.100.100.101 +designate_galera_database: designate +designate_galera_user: designate designate_container_mysql_password: "SuperSecrete" designate_pool_manager_galera_address: 10.100.100.101 +designate_pool_manager_galera_database: designate_pool_manager +designate_pool_manager_galera_user: designate_pool_manager designate_pool_manager_container_mysql_password: "SuperSecrete" designate_rabbitmq_password: "secrete" designate_rabbitmq_userid: designate