Move MQ vhost/user creation into role

There is no record for why we implement the MQ vhost/user 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 two new variables:
- octavia_oslomsg_rpc_setup_host
- octavia_oslomsg_notify_setup_host

These are used in the role to allow delegation of the MQ vhost/user
setup for each type to any host, but they default to using the first
member of the applicable oslomsg host group.

We also adjust some of the defaults to automatically inherit existing
vars set in group_vars form the integrated build so that we do not
need to do the wiring in the integrated build's group vars. We still
default them in the role too for independent role usage.

Finally, we remove the test mq setup tasks and clean up any unused
or unnecessary variables configured in tests.

We also rename the ubuntu-16.04.yml file to ubuntu.yml to cover both
xenial and bionic. This has become necessary because the
'Gather variables for each operating system' task in the galera_client
role is picking up this role's vars file instead of its own.

Change-Id: If7e3712dd70eb083b5dffc98e0c981ec4f513533
This commit is contained in:
Jesse Pretorius 2018-07-17 22:08:03 +01:00
parent 53efcc8798
commit b6d495c9c9
6 changed files with 79 additions and 32 deletions

View File

@ -67,18 +67,22 @@ octavia_db_pool_timeout: 30
## Oslo Messaging ## Oslo Messaging
# RPC # RPC
octavia_oslomsg_rpc_transport: rabbit octavia_oslomsg_rpc_host_group: "{{ oslomsg_rpc_host_group | default('rabbitmq_all') }}"
octavia_oslomsg_rpc_servers: 127.0.0.1 octavia_oslomsg_rpc_setup_host: "{{ (octavia_oslomsg_rpc_host_group in groups) | ternary(groups[octavia_oslomsg_rpc_host_group][0], 'localhost') }}"
octavia_oslomsg_rpc_port: 5672 octavia_oslomsg_rpc_transport: "{{ oslomsg_rpc_transport | default('rabbit') }}"
octavia_oslomsg_rpc_use_ssl: False octavia_oslomsg_rpc_servers: "{{ oslomsg_rpc_servers | default('127.0.0.1') }}"
octavia_oslomsg_rpc_port: "{{ oslomsg_rpc_port | default('5672') }}"
octavia_oslomsg_rpc_use_ssl: "{{ oslomsg_rpc_use_ssl | default(False) }}"
octavia_oslomsg_rpc_userid: octavia octavia_oslomsg_rpc_userid: octavia
octavia_oslomsg_rpc_vhost: /octavia octavia_oslomsg_rpc_vhost: /octavia
# Notify # Notify
octavia_oslomsg_notify_transport: rabbit octavia_oslomsg_notify_host_group: "{{ oslomsg_notify_host_group | default('rabbitmq_all') }}"
octavia_oslomsg_notify_servers: 127.0.0.1 octavia_oslomsg_notify_setup_host: "{{ (octavia_oslomsg_notify_host_group in groups) | ternary(groups[octavia_oslomsg_notify_host_group][0], 'localhost') }}"
octavia_oslomsg_notify_port: 5672 octavia_oslomsg_notify_transport: "{{ oslomsg_notify_transport | default('rabbit') }}"
octavia_oslomsg_notify_use_ssl: False octavia_oslomsg_notify_servers: "{{ oslomsg_notify_servers | default('127.0.0.1') }}"
octavia_oslomsg_notify_port: "{{ oslomsg_notify_port | default('5672') }}"
octavia_oslomsg_notify_use_ssl: "{{ oslomsg_notify_use_ssl | default(False) }}"
octavia_oslomsg_notify_userid: "{{ octavia_oslomsg_rpc_userid }}" octavia_oslomsg_notify_userid: "{{ octavia_oslomsg_rpc_userid }}"
octavia_oslomsg_notify_password: "{{ octavia_oslomsg_rpc_password }}" octavia_oslomsg_notify_password: "{{ octavia_oslomsg_rpc_password }}"
octavia_oslomsg_notify_vhost: "{{ octavia_oslomsg_rpc_vhost }}" octavia_oslomsg_notify_vhost: "{{ octavia_oslomsg_rpc_vhost }}"

View File

@ -83,8 +83,27 @@
- octavia-install - octavia-install
- octavia-config - octavia-config
- include_tasks: mq_setup.yml
when:
- inventory_hostname == groups['octavia_all'][0]
with_items:
- oslomsg_setup_host: "{{ octavia_oslomsg_rpc_setup_host }}"
oslomsg_userid: "{{ octavia_oslomsg_rpc_userid }}"
oslomsg_password: "{{ octavia_oslomsg_rpc_password }}"
oslomsg_vhost: "{{ octavia_oslomsg_rpc_vhost }}"
oslomsg_transport: "{{ octavia_oslomsg_rpc_transport }}"
- oslomsg_setup_host: "{{ octavia_oslomsg_notify_setup_host }}"
oslomsg_userid: "{{ octavia_oslomsg_notify_userid }}"
oslomsg_password: "{{ octavia_oslomsg_notify_password }}"
oslomsg_vhost: "{{ octavia_oslomsg_notify_vhost }}"
oslomsg_transport: "{{ octavia_oslomsg_notify_transport }}"
no_log: true
tags:
- octavia-config
- include: octavia_db_setup.yml - include: octavia_db_setup.yml
when: inventory_hostname == groups['octavia_all'][0] when:
- inventory_hostname == groups['octavia_all'][0]
tags: tags:
- octavia-install - octavia-install

45
tasks/mq_setup.yml Normal file
View File

@ -0,0 +1,45 @@
---
# Copyright 2018, Rackspace US, Inc.
#
# 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.
# WARNING:
# This file is maintained in the openstack-ansible-tests repository.
# https://git.openstack.org/cgit/openstack/openstack-ansible-tests/tree/sync/mq_setup.yml
# If you need to modify this file, update the one in the openstack-ansible-tests
# repository. Once it merges there, the changes will automatically be proposed to
# all the repositories which use it.
- name: Setup MQ Service (RabbitMQ)
delegate_to: "{{ item.oslomsg_setup_host }}"
when:
- "item.oslomsg_transport == 'rabbit'"
block:
- name: Add RabbitMQ vhost
rabbitmq_vhost:
name: "{{ item.oslomsg_vhost }}"
state: "present"
- name: Add RabbitMQ user
rabbitmq_user:
user: "{{ item.oslomsg_userid }}"
password: "{{ item.oslomsg_password }}"
vhost: "{{ item.oslomsg_vhost }}"
configure_priv: ".*"
read_priv: ".*"
write_priv: ".*"
state: "present"
force: true
no_log: true
# Note: Add the tasks for additional MQ servers here

View File

@ -50,20 +50,7 @@ octavia_galera_address: "{{ test_galera_host }}"
octavia_galera_database: octavia octavia_galera_database: octavia
octavia_galera_user: octavia octavia_galera_user: octavia
octavia_container_mysql_password: "secrete" octavia_container_mysql_password: "secrete"
octavia_oslomsg_rpc_transport: "{{ oslomsg_rpc_transport }}"
octavia_oslomsg_rpc_password: "{{ oslomsg_rpc_password }}" octavia_oslomsg_rpc_password: "{{ oslomsg_rpc_password }}"
octavia_oslomsg_rpc_userid: octavia
octavia_oslomsg_rpc_vhost: /octavia
octavia_oslomsg_rpc_servers: "{{ oslomsg_rpc_servers }}"
octavia_oslomsg_rpc_use_ssl: "{{ oslomsg_rpc_use_ssl }}"
octavia_oslomsg_rpc_port: "{{ oslomsg_rpc_port }}"
octavia_oslomsg_notify_transport: "{{ oslomsg_notify_transport }}"
octavia_oslomsg_notify_password: "{{ oslomsg_notify_password }}"
octavia_oslomsg_notify_userid: octavia
octavia_oslomsg_notify_vhost: /octavia
octavia_oslomsg_notify_servers: "{{ oslomsg_notify_servers }}"
octavia_oslomsg_notify_ssl: "{{ oslomsg_notify_use_ssl }}"
octavia_oslomsg_notify_port: "{{ oslomsg_notify_port }}"
octavia_standalone: False octavia_standalone: False
octavia_swift_temp_url_secret_key: secrete octavia_swift_temp_url_secret_key: secrete
octavia_keystone_auth_plugin: password octavia_keystone_auth_plugin: password

View File

@ -15,15 +15,7 @@
hosts: octavia_all hosts: octavia_all
remote_user: root remote_user: root
gather_facts: true gather_facts: true
pre_tasks:
- include: common/ensure-oslomsg.yml
rpc_vhost: "{{ octavia_oslomsg_rpc_vhost }}"
rpc_user: "{{ octavia_oslomsg_rpc_userid }}"
rpc_password: "{{ octavia_oslomsg_rpc_password }}"
notify_vhost: "{{ octavia_oslomsg_notify_vhost }}"
notify_user: "{{ octavia_oslomsg_notify_userid }}"
notify_password: "{{ octavia_oslomsg_notify_password }}"
roles:
- role: "{{ octavia_rolename | default('os_octavia') }}"
vars_files: vars_files:
- common/test-vars.yml - common/test-vars.yml
roles:
- role: "os_octavia"