Removed the db create tasks

The db create tasks have been removed from the role and have been
relocated into the playbooks.

Change-Id: I8b9761689f3c6c51a3a7b50e71c8acf040a6c32f
Depends-On: If58e482034a65c0e50241448dbe298a73c1ae71b
Signed-off-by: Kevin Carter <kevin.carter@rackspace.com>
This commit is contained in:
Kevin Carter 2016-05-10 22:24:03 -05:00 committed by Jimmy McCrory
parent b3c05fa39d
commit 1a40c1c8d3
4 changed files with 44 additions and 62 deletions

View File

@ -0,0 +1,5 @@
---
upgrade:
- The database create and user creates have been removed
from the ``os_nova`` role. These tasks have been relocated
to the playbooks.

View File

@ -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: "{{ nova_galera_address }}"
name: "{{ nova_galera_database }}"
state: "present"
tags:
- nova-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: "{{ nova_galera_address }}"
name: "{{ nova_galera_user }}"
password: "{{ nova_container_mysql_password }}"
host: "{{ item }}"
state: "present"
priv: "{{ nova_galera_database }}.*:ALL"
with_items:
- "localhost"
- "%"
tags:
- nova-db-setup
- name: Create API DB for service
mysql_db:
login_user: "{{ galera_root_user }}"
login_password: "{{ galera_root_password }}"
login_host: "{{ nova_api_galera_address }}"
name: "{{ nova_api_galera_database }}"
state: "present"
tags:
- nova-db-setup
- name: Grant access to the API DB for the service
mysql_user:
login_user: "{{ galera_root_user }}"
login_password: "{{ galera_root_password }}"
login_host: "{{ nova_api_galera_address }}"
name: "{{ nova_api_galera_user }}"
password: "{{ nova_api_container_mysql_password }}"
host: "{{ item }}"
state: "present"
priv: "{{ nova_api_galera_database }}.*:ALL"
with_items:
- "localhost"
- "%"
tags:
- nova-db-setup
- name: Perform a Nova DB sync
command: "{{ nova_bin }}/nova-manage db sync"
become: yes

View File

@ -37,8 +37,8 @@
delegate_to: "10.100.102.101"
when: inventory_hostname == groups['nova_all'][0]
tags:
- aodh-rabbitmq
- aodh-rabbitmq-vhost
- nova-rabbitmq
- nova-rabbitmq-vhost
- name: Ensure rabbitmq user
rabbitmq_user:
user: "{{ nova_rabbitmq_userid }}"
@ -51,13 +51,13 @@
delegate_to: "10.100.102.101"
when: inventory_hostname == groups['nova_all'][0]
tags:
- aodh-rabbitmq
- aodh-rabbitmq-user
- nova-rabbitmq
- nova-rabbitmq-user
- name: Create DB for service
mysql_db:
login_user: "root"
login_password: "secrete"
login_host: "localhost"
login_user: "{{ galera_root_user }}"
login_password: "{{ galera_root_password }}"
login_host: "{{ nova_galera_address }}"
name: "{{ nova_galera_database }}"
state: "present"
delegate_to: "10.100.102.101"
@ -66,9 +66,9 @@
- mysql-db-setup
- name: Grant access to the DB for the service
mysql_user:
login_user: "root"
login_password: "secrete"
login_host: "localhost"
login_user: "{{ galera_root_user }}"
login_password: "{{ galera_root_password }}"
login_host: "{{ nova_galera_address }}"
name: "{{ nova_galera_database }}"
password: "{{ nova_container_mysql_password }}"
host: "{{ item }}"
@ -81,6 +81,32 @@
when: inventory_hostname == groups['nova_all'][0]
tags:
- mysql-db-setup
- name: Create API DB for service
mysql_db:
login_user: "{{ galera_root_user }}"
login_password: "{{ galera_root_password }}"
login_host: "{{ nova_api_galera_address }}"
name: "{{ nova_api_galera_database }}"
state: "present"
when: inventory_hostname == groups['nova_all'][0]
tags:
- nova-db-setup
- name: Grant access to the API DB for the service
mysql_user:
login_user: "{{ galera_root_user }}"
login_password: "{{ galera_root_password }}"
login_host: "{{ nova_api_galera_address }}"
name: "{{ nova_api_galera_user }}"
password: "{{ nova_api_container_mysql_password }}"
host: "{{ item }}"
state: "present"
priv: "{{ nova_api_galera_database }}.*:ALL"
with_items:
- "localhost"
- "%"
when: inventory_hostname == groups['nova_all'][0]
tags:
- nova-db-setup
roles:
- role: "{{ rolename | basename }}"
vars_files:

View File

@ -18,6 +18,7 @@ cinder_ceph_client: cinder
debug: true
external_lb_vip_address: 10.100.102.102
galera_client_drop_config_file: false
galera_root_user: root
galera_root_password: secrete
glance_container_mysql_password: "SuperSecrete"
glance_developer_mode: true
@ -79,6 +80,8 @@ neutron_service_user_name: neutron
neutron_venv_tag: testing
nova_api_container_mysql_password: "SuperSecrete"
nova_api_galera_address: 10.100.102.101
nova_api_galera_database: nova_api
nova_api_galera_user: nova_api
nova_container_mysql_password: "SuperSecrete"
nova_developer_mode: true
nova_galera_address: 10.100.102.101