From 996fcb7dc7f6fd68c34d3c5c13d2579b3591dea6 Mon Sep 17 00:00:00 2001 From: Jesse Pretorius Date: Tue, 17 Jul 2018 22:05:12 +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: - ironic_oslomsg_rpc_setup_host - ironic_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. Depends-On: https://review.openstack.org/583430 Change-Id: I331be6ce2ca304f31844d8b0cd48e2640d8312d4 --- defaults/main.yml | 20 +++++++++------- tasks/main.yml | 19 +++++++++++++++ tasks/mq_setup.yml | 45 +++++++++++++++++++++++++++++++++++ tests/os_ironic-overrides.yml | 3 +++ 4 files changed, 79 insertions(+), 8 deletions(-) create mode 100644 tasks/mq_setup.yml diff --git a/defaults/main.yml b/defaults/main.yml index 84a1bf12..3bd229f0 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -222,18 +222,22 @@ ironic_pip_packages: ## Oslo Messaging Info # RPC -ironic_oslomsg_rpc_transport: rabbit -ironic_oslomsg_rpc_servers: 127.0.0.1 -ironic_oslomsg_rpc_port: 5672 -ironic_oslomsg_rpc_use_ssl: False +ironic_oslomsg_rpc_host_group: "{{ oslomsg_rpc_host_group | default('rabbitmq_all') }}" +ironic_oslomsg_rpc_setup_host: "{{ (ironic_oslomsg_rpc_host_group in groups) | ternary(groups[ironic_oslomsg_rpc_host_group][0], 'localhost') }}" +ironic_oslomsg_rpc_transport: "{{ oslomsg_rpc_transport | default('rabbit') }}" +ironic_oslomsg_rpc_servers: "{{ oslomsg_rpc_servers | default('127.0.0.1') }}" +ironic_oslomsg_rpc_port: "{{ oslomsg_rpc_port | default('5672') }}" +ironic_oslomsg_rpc_use_ssl: "{{ oslomsg_rpc_use_ssl | default(False) }}" ironic_oslomsg_rpc_userid: ironic ironic_oslomsg_rpc_vhost: /ironic # Notify -ironic_oslomsg_notify_transport: rabbit -ironic_oslomsg_notify_servers: 127.0.0.1 -ironic_oslomsg_notify_port: 5672 -ironic_oslomsg_notify_use_ssl: False +ironic_oslomsg_notify_host_group: "{{ oslomsg_notify_host_group | default('rabbitmq_all') }}" +ironic_oslomsg_notify_setup_host: "{{ (ironic_oslomsg_notify_host_group in groups) | ternary(groups[ironic_oslomsg_notify_host_group][0], 'localhost') }}" +ironic_oslomsg_notify_transport: "{{ oslomsg_notify_transport | default('rabbit') }}" +ironic_oslomsg_notify_servers: "{{ oslomsg_notify_servers | default('127.0.0.1') }}" +ironic_oslomsg_notify_port: "{{ oslomsg_notify_port | default('5672') }}" +ironic_oslomsg_notify_use_ssl: "{{ oslomsg_notify_use_ssl | default(False) }}" ironic_oslomsg_notify_userid: ironic ironic_oslomsg_notify_vhost: /ironic diff --git a/tasks/main.yml b/tasks/main.yml index c1f92613..7c86c24d 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -48,6 +48,25 @@ tags: - ironic-config +- include_tasks: mq_setup.yml + when: + - "ironic_services['ironic-api']['group'] in group_names" + - "inventory_hostname == ((groups[ironic_services['ironic-api']['group']]| intersect(ansible_play_hosts)) | list)[0]" + with_items: + - oslomsg_setup_host: "{{ ironic_oslomsg_rpc_setup_host }}" + oslomsg_userid: "{{ ironic_oslomsg_rpc_userid }}" + oslomsg_password: "{{ ironic_oslomsg_rpc_password }}" + oslomsg_vhost: "{{ ironic_oslomsg_rpc_vhost }}" + oslomsg_transport: "{{ ironic_oslomsg_rpc_transport }}" + - oslomsg_setup_host: "{{ ironic_oslomsg_notify_setup_host }}" + oslomsg_userid: "{{ ironic_oslomsg_notify_userid }}" + oslomsg_password: "{{ ironic_oslomsg_notify_password }}" + oslomsg_vhost: "{{ ironic_oslomsg_notify_vhost }}" + oslomsg_transport: "{{ ironic_oslomsg_notify_transport }}" + no_log: true + tags: + - ironic-config + - include: ironic_db_setup.yml when: inventory_hostname == groups['ironic_conductor'][0] tags: 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 diff --git a/tests/os_ironic-overrides.yml b/tests/os_ironic-overrides.yml index 9218ab93..43838811 100644 --- a/tests/os_ironic-overrides.yml +++ b/tests/os_ironic-overrides.yml @@ -37,3 +37,6 @@ neutron_l3: True neutron_metadata: True ironic_pip_package_state: latest ironic_service_user_name: "ironic" + +ironic_oslomsg_rpc_password: "{{ oslomsg_rpc_password }}" +ironic_oslomsg_notify_password: "{{ oslomsg_notify_password }}"