From 19f299854e2df9509839a53d5a90bb9971ba3fac Mon Sep 17 00:00:00 2001 From: Jesse Pretorius Date: Sat, 28 Jul 2018 13:12:32 +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: - cloudkitty_oslomsg_rpc_setup_host - cloudkitty_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: Iac217b80df3da79a944185a90ba4c1ff5409945b --- defaults/main.yml | 20 +++++++------ extras/user_secrets_cloudkitty.yml | 2 +- tasks/main.yml | 21 +++++++++++++- tasks/mq_setup.yml | 45 ++++++++++++++++++++++++++++++ tests/os_cloudkitty-overrides.yml | 5 ---- tests/test-install-cloudkitty.yml | 12 ++------ 6 files changed, 80 insertions(+), 25 deletions(-) create mode 100644 tasks/mq_setup.yml diff --git a/defaults/main.yml b/defaults/main.yml index b2e69ad..8688011 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -31,18 +31,22 @@ cloudkitty_service_user_name: cloudkitty ## Oslo Messaging info # RPC -cloudkitty_oslomsg_rpc_transport: rabbit -cloudkitty_oslomsg_rpc_servers: 127.0.0.1 -cloudkitty_oslomsg_rpc_port: 5672 -cloudkitty_oslomsg_rpc_use_ssl: False +cloudkitty_oslomsg_rpc_host_group: "{{ oslomsg_rpc_host_group | default('rabbitmq_all') }}" +cloudkitty_oslomsg_rpc_setup_host: "{{ (cloudkitty_oslomsg_rpc_host_group in groups) | ternary(groups[cloudkitty_oslomsg_rpc_host_group][0], 'localhost') }}" +cloudkitty_oslomsg_rpc_transport: "{{ oslomsg_rpc_transport | default('rabbit') }}" +cloudkitty_oslomsg_rpc_servers: "{{ oslomsg_rpc_servers | default('127.0.0.1') }}" +cloudkitty_oslomsg_rpc_port: "{{ oslomsg_rpc_port | default('5672') }}" +cloudkitty_oslomsg_rpc_use_ssl: "{{ oslomsg_rpc_use_ssl | default(False) }}" cloudkitty_oslomsg_rpc_userid: cloudkitty cloudkitty_oslomsg_rpc_vhost: /cloudkitty # Notify -cloudkitty_oslomsg_notify_transport: rabbit -cloudkitty_oslomsg_notify_servers: 127.0.0.1 -cloudkitty_oslomsg_notify_port: 5672 -cloudkitty_oslomsg_notify_use_ssl: False +cloudkitty_oslomsg_notify_host_group: "{{ oslomsg_notify_host_group | default('rabbitmq_all') }}" +cloudkitty_oslomsg_notify_setup_host: "{{ (cloudkitty_oslomsg_notify_host_group in groups) | ternary(groups[cloudkitty_oslomsg_notify_host_group][0], 'localhost') }}" +cloudkitty_oslomsg_notify_transport: "{{ oslomsg_notify_transport | default('rabbit') }}" +cloudkitty_oslomsg_notify_servers: "{{ oslomsg_notify_servers | default('127.0.0.1') }}" +cloudkitty_oslomsg_notify_port: "{{ oslomsg_notify_port | default('5672') }}" +cloudkitty_oslomsg_notify_use_ssl: "{{ oslomsg_notify_use_ssl | default(False) }}" cloudkitty_oslomsg_notify_userid: "{{ cloudkitty_oslomsg_rpc_userid }}" cloudkitty_oslomsg_notify_password: "{{ cloudkitty_oslomsg_rpc_password }}" cloudkitty_oslomsg_notify_vhost: "{{ cloudkitty_oslomsg_rpc_vhost }}" diff --git a/extras/user_secrets_cloudkitty.yml b/extras/user_secrets_cloudkitty.yml index b4f9632..5f131bf 100644 --- a/extras/user_secrets_cloudkitty.yml +++ b/extras/user_secrets_cloudkitty.yml @@ -1,4 +1,4 @@ ## Cloudkitty passwords cloudkitty_service_password: -cloudkitty_rabbitmq_password: cloudkitty_container_mysql_password: +cloudkitty_oslomsg_rpc_password: diff --git a/tasks/main.yml b/tasks/main.yml index 2c4ffb0..2941ff8 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -46,8 +46,27 @@ - include: cloudkitty_service_setup.yml when: inventory_hostname == groups['cloudkitty_all'][0] +- include_tasks: mq_setup.yml + when: + - inventory_hostname == groups['cloudkitty_all'][0] + with_items: + - oslomsg_setup_host: "{{ cloudkitty_oslomsg_rpc_setup_host }}" + oslomsg_userid: "{{ cloudkitty_oslomsg_rpc_userid }}" + oslomsg_password: "{{ cloudkitty_oslomsg_rpc_password }}" + oslomsg_vhost: "{{ cloudkitty_oslomsg_rpc_vhost }}" + oslomsg_transport: "{{ cloudkitty_oslomsg_rpc_transport }}" + - oslomsg_setup_host: "{{ cloudkitty_oslomsg_notify_setup_host }}" + oslomsg_userid: "{{ cloudkitty_oslomsg_notify_userid }}" + oslomsg_password: "{{ cloudkitty_oslomsg_notify_password }}" + oslomsg_vhost: "{{ cloudkitty_oslomsg_notify_vhost }}" + oslomsg_transport: "{{ cloudkitty_oslomsg_notify_transport }}" + no_log: true + tags: + - cloudkitty-config + - include: cloudkitty_db_setup.yml - when: inventory_hostname == groups['cloudkitty_all'][0] + when: + - inventory_hostname == groups['cloudkitty_all'][0] - include: "cloudkitty_init_{{ ansible_service_mgr }}.yml" 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_cloudkitty-overrides.yml b/tests/os_cloudkitty-overrides.yml index 4c30d07..272a229 100644 --- a/tests/os_cloudkitty-overrides.yml +++ b/tests/os_cloudkitty-overrides.yml @@ -21,8 +21,3 @@ cloudkitty_galera_address: "{{ hostvars[groups['galera_all'][0]]['ansible_host'] cloudkitty_container_mysql_password: "SuperSecrete" cloudkitty_service_password: "secrete" cloudkitty_oslomsg_rpc_password: "secrete" -cloudkitty_oslomsg_rpc_userid: cloudkitty -cloudkitty_oslomsg_rpc_vhost: /cloudkitty -cloudkitty_oslomsg_notify_password: "secrete" -cloudkitty_oslomsg_notify_userid: cloudkitty -cloudkitty_oslomsg_notify_vhost: /cloudkitty diff --git a/tests/test-install-cloudkitty.yml b/tests/test-install-cloudkitty.yml index 6be564b..4583210 100644 --- a/tests/test-install-cloudkitty.yml +++ b/tests/test-install-cloudkitty.yml @@ -17,15 +17,7 @@ hosts: cloudkitty_all remote_user: root gather_facts: true - pre_tasks: - - include: common/ensure-oslomsg.yml - rpc_vhost: "{{ cloudkitty_oslomsg_rpc_vhost }}" - rpc_user: "{{ cloudkitty_oslomsg_rpc_userid }}" - rpc_password: "{{ cloudkitty_oslomsg_rpc_password }}" - notify_vhost: "{{ cloudkitty_oslomsg_notify_vhost }}" - notify_user: "{{ cloudkitty_oslomsg_notify_userid }}" - notify_password: "{{ cloudkitty_oslomsg_notify_password }}" - roles: - - role: "os_cloudkitty" vars_files: - common/test-vars.yml + roles: + - role: "os_cloudkitty"