Skip to content

Commit

Permalink
Move database creation into role (neutron)
Browse files Browse the repository at this point in the history
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 remove the group_vars which were duplicated from the
role, and remove the DB setup tasks as they are no longer required.

Change-Id: I95971cc58aedfaf88cc209e81aa1848b9e6990f6
Depends-On: https://review.openstack.org/571781
  • Loading branch information
Jesse Pretorius committed Jun 1, 2018
1 parent aa2ac0b commit b44b828
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 14 deletions.
4 changes: 0 additions & 4 deletions inventory/group_vars/neutron_all.yml
Expand Up @@ -41,10 +41,6 @@ neutron_ceilometer_enabled: "{{ hostvars['localhost']['neutron_ceilometer_enable
neutron_dns_domain: "{{ dhcp_domain }}"
neutron_service_in_ldap: "{{ service_ldap_backend_enabled }}"

neutron_galera_user: neutron
neutron_galera_database: neutron
neutron_galera_address: "{{ galera_address }}"

# Ensure that the package state matches the global setting
neutron_package_state: "{{ package_state }}"

Expand Down
10 changes: 0 additions & 10 deletions playbooks/os-neutron-install.yml
Expand Up @@ -81,16 +81,6 @@
- groups[oslomsg_notify_host_group] | length > 0
run_once: yes

- name: Configure MySQL user
include: common-tasks/mysql-db-user.yml
static: no
vars:
user_name: "{{ neutron_galera_user }}"
password: "{{ neutron_container_mysql_password }}"
login_host: "{{ neutron_galera_address }}"
db_name: "{{ neutron_galera_database }}"
run_once: yes



- name: Install neutron server
Expand Down

0 comments on commit b44b828

Please sign in to comment.