Merge "Move database creation into role (nova)"

This commit is contained in:
Zuul 2018-06-28 19:13:06 +00:00 committed by Gerrit Code Review
commit ece3fcb1c3
2 changed files with 1 additions and 39 deletions

View File

@ -48,15 +48,6 @@ nova_ceilometer_enabled: "{{ (groups['ceilometer_all'] is defined) and (groups['
# If there are any Barbican hosts in the environment, then enable its usage
nova_barbican_enabled: "{{ hostvars['localhost']['nova_barbican_enabled'] }}"
# The MySQL details for the nova service
nova_galera_user: nova
nova_galera_database: nova
nova_galera_address: "{{ galera_address }}"
nova_api_galera_user: nova_api
nova_api_galera_database: nova_api
nova_api_galera_address: "{{ galera_address }}"
nova_cell0_database: nova_cell0
nova_external_ssl: "{{ openstack_external_ssl }}"
nova_ceph_client_uuid: '{{ cinder_ceph_client_uuid | default() }}'
nova_dhcp_domain: "{{ dhcp_domain }}"

View File

@ -13,7 +13,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
- name: Prepare MQ/DB services
- name: Prepare MQ services
hosts: nova_conductor
gather_facts: no
user: root
@ -44,35 +44,6 @@
- groups[nova_oslomsg_notify_host_group] | length > 0
run_once: yes
- name: Configure MySQL user (nova)
include: common-tasks/mysql-db-user.yml
vars:
user_name: "{{ nova_galera_user }}"
password: "{{ nova_container_mysql_password }}"
login_host: "{{ nova_galera_address }}"
db_name: "{{ nova_galera_database }}"
run_once: yes
- name: Configure MySQL user (nova-api)
include: common-tasks/mysql-db-user.yml
vars:
user_name: "{{ nova_api_galera_user }}"
password: "{{ nova_api_container_mysql_password }}"
login_host: "{{ nova_api_galera_address }}"
db_name: "{{ nova_api_galera_database }}"
db_append_privs: "yes"
run_once: yes
- name: Configure MySQL user (nova-api cell0)
include: common-tasks/mysql-db-user.yml
vars:
user_name: "{{ nova_api_galera_user }}"
password: "{{ nova_api_container_mysql_password }}"
login_host: "{{ nova_api_galera_address }}"
db_name: "{{ nova_cell0_database }}"
db_append_privs: "yes"
run_once: yes
- name: Install nova-conductor services