From 2ab1b994468bfe412f7158e557c80f7d63be0b8e Mon Sep 17 00:00:00 2001 From: Jesse Pretorius Date: Fri, 27 Jul 2018 12:09:43 +0100 Subject: [PATCH] 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: - watcher_oslomsg_rpc_setup_host - watcher_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. Change-Id: I6b781cde4e075dee9d79cf28a55eeda00460c37d --- defaults/main.yml | 24 +++++++++--------- tasks/main.yml | 18 ++++++++++++++ tasks/mq_setup.yml | 45 ++++++++++++++++++++++++++++++++++ tests/os_watcher-overrides.yml | 21 ---------------- tests/test-install-watcher.yml | 12 ++------- 5 files changed, 77 insertions(+), 43 deletions(-) create mode 100644 tasks/mq_setup.yml diff --git a/defaults/main.yml b/defaults/main.yml index f855151..ae64a26 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -63,26 +63,26 @@ watcher_galera_database: watcher ## Oslo Messaging info # RPC -watcher_oslomsg_rpc_transport: rabbit -watcher_oslomsg_rpc_servers: 127.0.0.1 -watcher_oslomsg_rpc_port: 5672 -watcher_oslomsg_rpc_use_ssl: False +watcher_oslomsg_rpc_host_group: "{{ oslomsg_rpc_host_group | default('rabbitmq_all') }}" +watcher_oslomsg_rpc_setup_host: "{{ (watcher_oslomsg_rpc_host_group in groups) | ternary(groups[watcher_oslomsg_rpc_host_group][0], 'localhost') }}" +watcher_oslomsg_rpc_transport: "{{ oslomsg_rpc_transport | default('rabbit') }}" +watcher_oslomsg_rpc_servers: "{{ oslomsg_rpc_servers | default('127.0.0.1') }}" +watcher_oslomsg_rpc_port: "{{ oslomsg_rpc_port | default('5672') }}" +watcher_oslomsg_rpc_use_ssl: "{{ oslomsg_rpc_use_ssl | default(False) }}" watcher_oslomsg_rpc_userid: watcher watcher_oslomsg_rpc_vhost: /watcher # Notify -watcher_oslomsg_notify_transport: rabbit -watcher_oslomsg_notify_servers: 127.0.0.1 -watcher_oslomsg_notify_port: 5672 -watcher_oslomsg_notify_use_ssl: False +watcher_oslomsg_notify_host_group: "{{ oslomsg_notify_host_group | default('rabbitmq_all') }}" +watcher_oslomsg_notify_setup_host: "{{ (watcher_oslomsg_notify_host_group in groups) | ternary(groups[watcher_oslomsg_notify_host_group][0], 'localhost') }}" +watcher_oslomsg_notify_transport: "{{ oslomsg_notify_transport | default('rabbit') }}" +watcher_oslomsg_notify_servers: "{{ oslomsg_notify_servers | default('127.0.0.1') }}" +watcher_oslomsg_notify_port: "{{ oslomsg_notify_port | default('5672') }}" +watcher_oslomsg_notify_use_ssl: "{{ oslomsg_notify_use_ssl | default(False) }}" watcher_oslomsg_notify_userid: "{{ watcher_oslomsg_rpc_userid }}" watcher_oslomsg_notify_password: "{{ watcher_oslomsg_rpc_password }}" watcher_oslomsg_notify_vhost: "{{ watcher_oslomsg_rpc_vhost }}" -# Inventory group containing the hosts for the messaging backend -watcher_oslomsg_rpc_host_group: "oslomsg_rpc_all" -watcher_oslomsg_notify_host_group: "oslomsg_notify_all" - watcher_api_program_name: watcher-api watcher_decision_engine_program_name: watcher-decision-engine watcher_applier_program_name: watcher-applier diff --git a/tasks/main.yml b/tasks/main.yml index 538ad7d..9122c68 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -62,6 +62,24 @@ tags: - watcher-install +- include_tasks: mq_setup.yml + when: + - inventory_hostname == groups['watcher_api'][0] + with_items: + - oslomsg_setup_host: "{{ watcher_oslomsg_rpc_setup_host }}" + oslomsg_userid: "{{ watcher_oslomsg_rpc_userid }}" + oslomsg_password: "{{ watcher_oslomsg_rpc_password }}" + oslomsg_vhost: "{{ watcher_oslomsg_rpc_vhost }}" + oslomsg_transport: "{{ watcher_oslomsg_rpc_transport }}" + - oslomsg_setup_host: "{{ watcher_oslomsg_notify_setup_host }}" + oslomsg_userid: "{{ watcher_oslomsg_notify_userid }}" + oslomsg_password: "{{ watcher_oslomsg_notify_password }}" + oslomsg_vhost: "{{ watcher_oslomsg_notify_vhost }}" + oslomsg_transport: "{{ watcher_oslomsg_notify_transport }}" + no_log: true + tags: + - watcher-config + - include: watcher_db_setup.yml when: inventory_hostname == groups['watcher_api'][0] tags: diff --git a/tasks/mq_setup.yml b/tasks/mq_setup.yml new file mode 100644 index 0000000..2ef034a --- /dev/null +++ b/tasks/mq_setup.yml @@ -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 diff --git a/tests/os_watcher-overrides.yml b/tests/os_watcher-overrides.yml index 069b968..dedd36a 100644 --- a/tests/os_watcher-overrides.yml +++ b/tests/os_watcher-overrides.yml @@ -15,27 +15,6 @@ watcher_developer_mode: True watcher_galera_password: "secrete" -watcher_oslomsg_rpc_port: "{{ oslomsg_rpc_port }}" -watcher_oslomsg_rpc_use_ssl: "{{ oslomsg_rpc_use_ssl }}" -watcher_oslomsg_rpc_servers: "{{ oslomsg_rpc_servers }}" -watcher_oslomsg_rpc_host_group: "{{ oslomsg_rpc_host_group }}" watcher_oslomsg_rpc_password: "{{ oslomsg_rpc_password }}" -watcher_oslomsg_rpc_userid: watcher -watcher_oslomsg_rpc_vhost: /watcher -watcher_oslomsg_notify_port: "{{ oslomsg_notify_port }}" -watcher_oslomsg_notify_use_ssl: "{{ oslomsg_notify_use_ssl }}" -watcher_oslomsg_notify_servers: "{{ oslomsg_notify_servers }}" -watcher_oslomsg_notify_host_group: "{{ oslomsg_notify_host_group }}" -watcher_oslomsg_notify_password: "{{ oslomsg_notify_password }}" -watcher_oslomsg_notify_userid: watcher -watcher_oslomsg_notify_vhost: /watcher -watcher_requirements_git_install_branch: master watcher_service_adminurl: "http://{{ hostvars[groups['watcher_api'][0]]['ansible_host'] }}:9322" watcher_service_password: "secrete" -watcher_service_project_domain_id: default -watcher_service_project_name: service -watcher_service_region: RegionOne -watcher_service_user_domain_id: default -watcher_service_user_name: watcher -watcher_bin: "/openstack/venvs/watcher-{{ watcher_venv_tag }}/bin" -watcher_venv_tag: "testing" diff --git a/tests/test-install-watcher.yml b/tests/test-install-watcher.yml index c104e1b..553dc30 100644 --- a/tests/test-install-watcher.yml +++ b/tests/test-install-watcher.yml @@ -17,6 +17,8 @@ hosts: watcher_all user: root gather_facts: True + vars_files: + - common/test-vars.yml pre_tasks: # NOTE: These are typically installed in the repo server where we build the # watcher wheel @@ -31,15 +33,5 @@ - libvirt-dev when: inventory_hostname in groups['watcher_all'] - - include: common/ensure-oslomsg.yml - rpc_vhost: "{{ watcher_oslomsg_rpc_vhost }}" - rpc_user: "{{ watcher_oslomsg_rpc_userid }}" - rpc_password: "{{ watcher_oslomsg_rpc_password }}" - notify_vhost: "{{ watcher_oslomsg_notify_vhost }}" - notify_user: "{{ watcher_oslomsg_notify_userid }}" - notify_password: "{{ watcher_oslomsg_notify_password }}" - roles: - role: "os_watcher" - vars_files: - - common/test-vars.yml