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 'magnum_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 'magnum_galera_address' which
has been used for a long time, but never documented. A bunch of unused
variables have also been removed.

Change-Id: I81263f316503c12f8e7b35e6ba9be12cc72cda1a
This commit is contained in:
Jesse Pretorius 2018-06-28 15:03:30 +01:00 committed by Jesse Pretorius (odyssey4me)
parent 8ac6a6ac39
commit 52083133f6
3 changed files with 28 additions and 4 deletions

View File

@ -67,6 +67,8 @@ magnum_developer_constraints:
- "git+{{ magnum_git_repo }}@{{ magnum_git_install_branch }}#egg=magnum"
# Database vars
magnum_db_setup_host: "{{ ('galera_all' in groups) | ternary(groups['galera_all'][0], 'localhost') }}"
magnum_galera_address: "{{ galera_address | default('127.0.0.1') }}"
magnum_galera_database_name: magnum_service
magnum_galera_user: magnum
magnum_galera_use_ssl: "{{ galera_use_ssl | default(False) }}"

View File

@ -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: "{{ magnum_galera_address }}"
name: "{{ magnum_galera_database_name }}"
state: "present"
delegate_to: "{{ magnum_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: "{{ magnum_galera_address }}"
name: "{{ magnum_galera_user }}"
password: "{{ magnum_galera_password }}"
host: "{{ item }}"
state: "present"
priv: "{{ magnum_galera_database_name }}.*:ALL"
delegate_to: "{{ magnum_db_setup_host }}"
with_items:
- "localhost"
- "%"
no_log: True
- name: Perform a synchronization of the Magnum database
command: "{{ magnum_bin}}/magnum-db-manage upgrade"
become: yes

View File

@ -21,10 +21,6 @@
vhost_name: "{{ magnum_rabbitmq_vhost }}"
user_name: "{{ magnum_rabbitmq_userid }}"
user_password: "{{ magnum_rabbitmq_password }}"
- include: common/create-grant-db.yml
db_user: "{{ magnum_galera_user }}"
db_name: "{{ magnum_galera_database_name }}"
db_password: "{{ magnum_galera_password }}"
roles:
- role: "os_magnum"
vars_files: