From 1ddd7590cf175602bed94b2a88d6d2a4af208e51 Mon Sep 17 00:00:00 2001 From: Jesse Pretorius Date: Tue, 17 Jul 2018 22:09:31 +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 the new variable: - swift_oslomsg_notify_setup_host This is 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. Depends-On: https://review.openstack.org/584630 Change-Id: I3d5e00e090d37ea7aa95460965749ef066b63b23 --- defaults/main.yml | 10 ++++++---- tasks/main.yml | 14 ++++++++++++++ tasks/mq_setup.yml | 45 +++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 65 insertions(+), 4 deletions(-) create mode 100644 tasks/mq_setup.yml diff --git a/defaults/main.yml b/defaults/main.yml index e69ba8fe..0a727afd 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -197,10 +197,12 @@ swift_reselleradmin_role: ResellerAdmin ## Oslo Messaging # Notify -swift_oslomsg_notify_transport: rabbit -swift_oslomsg_notify_servers: 127.0.0.1 -swift_oslomsg_notify_port: 5672 -swift_oslomsg_notify_use_ssl: False +swift_oslomsg_notify_host_group: "{{ oslomsg_notify_host_group | default('rabbitmq_all') }}" +swift_oslomsg_notify_setup_host: "{{ (swift_oslomsg_notify_host_group in groups) | ternary(groups[swift_oslomsg_notify_host_group][0], 'localhost') }}" +swift_oslomsg_notify_transport: "{{ oslomsg_notify_transport | default('rabbit') }}" +swift_oslomsg_notify_servers: "{{ oslomsg_notify_servers | default('127.0.0.1') }}" +swift_oslomsg_notify_port: "{{ oslomsg_notify_port | default('5672') }}" +swift_oslomsg_notify_use_ssl: "{{ oslomsg_notify_use_ssl | default(False) }}" swift_oslomsg_notify_userid: swift swift_oslomsg_notify_vhost: /swift diff --git a/tasks/main.yml b/tasks/main.yml index bf46fbef..abc39e58 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -115,6 +115,20 @@ - swift-config - systemd-service +- include_tasks: mq_setup.yml + when: + - "swift_services['swift-proxy-server']['group'] in group_names" + - "inventory_hostname == ((groups[swift_services['swift-proxy-server']['group']]| intersect(ansible_play_hosts)) | list)[0]" + with_items: + - oslomsg_setup_host: "{{ swift_oslomsg_notify_setup_host }}" + oslomsg_userid: "{{ swift_oslomsg_notify_userid }}" + oslomsg_password: "{{ swift_oslomsg_notify_password }}" + oslomsg_vhost: "{{ swift_oslomsg_notify_vhost }}" + oslomsg_transport: "{{ swift_oslomsg_notify_transport }}" + no_log: true + tags: + - swift-config + - include_tasks: swift_service_setup.yml when: - "swift_do_setup | bool" diff --git a/tasks/mq_setup.yml b/tasks/mq_setup.yml new file mode 100644 index 00000000..2ef034a3 --- /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