From 59e61f13906447b43a12393b181caf05b57afe9f Mon Sep 17 00:00:00 2001 From: Jesse Pretorius Date: Fri, 27 Jul 2018 12:02:29 +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: - tacker_oslomsg_rpc_setup_host - tacker_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: I481b2358bf3b93fba3057b825fc9e0f626d616ba --- defaults/main.yml | 20 +++++++++------- tasks/main.yml | 26 ++++++++++++++++---- tasks/mq_setup.yml | 45 +++++++++++++++++++++++++++++++++++ tests/os_tacker-overrides.yml | 14 +---------- tests/test-install-tacker.yml | 12 ++-------- 5 files changed, 82 insertions(+), 35 deletions(-) create mode 100644 tasks/mq_setup.yml diff --git a/defaults/main.yml b/defaults/main.yml index d9359d0..bdb3ad2 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -62,18 +62,22 @@ tacker_system_user_home: "/var/lib/{{ tacker_system_user_name }}" ## Configuration for Oslo Messaging # RPC -tacker_oslomsg_rpc_transport: rabbit -tacker_oslomsg_rpc_servers: "{{ oslomsg_rpc_all|default('127.0.0.1') }}" -tacker_oslomsg_rpc_port: 5672 -tacker_oslomsg_rpc_use_ssl: False +tacker_oslomsg_rpc_host_group: "{{ oslomsg_rpc_host_group | default('rabbitmq_all') }}" +tacker_oslomsg_rpc_setup_host: "{{ (tacker_oslomsg_rpc_host_group in groups) | ternary(groups[tacker_oslomsg_rpc_host_group][0], 'localhost') }}" +tacker_oslomsg_rpc_transport: "{{ oslomsg_rpc_transport | default('rabbit') }}" +tacker_oslomsg_rpc_servers: "{{ oslomsg_rpc_servers | default('127.0.0.1') }}" +tacker_oslomsg_rpc_port: "{{ oslomsg_rpc_port | default('5672') }}" +tacker_oslomsg_rpc_use_ssl: "{{ oslomsg_rpc_use_ssl | default(False) }}" tacker_oslomsg_rpc_userid: tacker tacker_oslomsg_rpc_vhost: /tacker # Notify -tacker_oslomsg_notify_transport: rabbit -tacker_oslomsg_notify_servers: "{{ oslomsg_notify_all|default('127.0.0.1') }}" -tacker_oslomsg_notify_port: 5672 -tacker_oslomsg_notify_use_ssl: False +tacker_oslomsg_notify_host_group: "{{ oslomsg_notify_host_group | default('rabbitmq_all') }}" +tacker_oslomsg_notify_setup_host: "{{ (tacker_oslomsg_notify_host_group in groups) | ternary(groups[tacker_oslomsg_notify_host_group][0], 'localhost') }}" +tacker_oslomsg_notify_transport: "{{ oslomsg_notify_transport | default('rabbit') }}" +tacker_oslomsg_notify_servers: "{{ oslomsg_notify_servers | default('127.0.0.1') }}" +tacker_oslomsg_notify_port: "{{ oslomsg_notify_port | default('5672') }}" +tacker_oslomsg_notify_use_ssl: "{{ oslomsg_notify_use_ssl | default(False) }}" tacker_oslomsg_notify_userid: "{{ tacker_oslomsg_rpc_userid }}" tacker_oslomsg_notify_password: "{{ tacker_oslomsg_rpc_password }}" tacker_oslomsg_notify_vhost: "{{ tacker_oslomsg_rpc_vhost }}" diff --git a/tasks/main.yml b/tasks/main.yml index f58cfe5..ba6644e 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -60,15 +60,33 @@ tags: - tacker-install +- include_tasks: mq_setup.yml + when: + - inventory_hostname == groups['tacker_all'][0] + with_items: + - oslomsg_setup_host: "{{ tacker_oslomsg_rpc_setup_host }}" + oslomsg_userid: "{{ tacker_oslomsg_rpc_userid }}" + oslomsg_password: "{{ tacker_oslomsg_rpc_password }}" + oslomsg_vhost: "{{ tacker_oslomsg_rpc_vhost }}" + oslomsg_transport: "{{ tacker_oslomsg_rpc_transport }}" + - oslomsg_setup_host: "{{ tacker_oslomsg_notify_setup_host }}" + oslomsg_userid: "{{ tacker_oslomsg_notify_userid }}" + oslomsg_password: "{{ tacker_oslomsg_notify_password }}" + oslomsg_vhost: "{{ tacker_oslomsg_notify_vhost }}" + oslomsg_transport: "{{ tacker_oslomsg_notify_transport }}" + no_log: true + tags: + - tacker-config + - include: tacker_db_setup.yml - when: > - inventory_hostname == groups['tacker_all'][0] + when: + - inventory_hostname == groups['tacker_all'][0] tags: - tacker-install - include: tacker_service_setup.yml - when: > - inventory_hostname == groups['tacker_all'][0] + when: + - inventory_hostname == groups['tacker_all'][0] tags: - tacker-install 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_tacker-overrides.yml b/tests/os_tacker-overrides.yml index 441b83c..2cf4225 100644 --- a/tests/os_tacker-overrides.yml +++ b/tests/os_tacker-overrides.yml @@ -13,22 +13,10 @@ # See the License for the specific language governing permissions and # limitations under the License. -tacker_service_tenant_name: service -tacker_oslomsg_rpc_port: "{{ oslomsg_rpc_port }}" -tacker_oslomsg_rpc_use_ssl: "{{ oslomsg_rpc_use_ssl }}" -tacker_oslomsg_rpc_servers: "{{ oslomsg_rpc_servers }}" -tacker_oslomsg_rpc_host_group: "{{ oslomsg_rpc_host_group }}" -tacker_oslomsg_notify_port: "{{ oslomsg_notify_port }}" -tacker_oslomsg_notify_use_ssl: "{{ oslomsg_notify_use_ssl }}" -tacker_oslomsg_notify_servers: "{{ oslomsg_notify_servers }}" -tacker_oslomsg_notify_host_group: "{{ oslomsg_notify_host_group }}" tacker_service_publicuri: "{{ tacker_service_proto }}://{{ hostvars[groups['tacker_all'][0]]['ansible_host'] }}:{{ tacker_service_port }}" tacker_service_adminurl: "{{ tacker_service_proto }}://{{ hostvars[groups['tacker_all'][0]]['ansible_host'] }}:{{ tacker_service_port }}" tacker_service_adminuri: "{{ tacker_service_proto }}://{{ hostvars[groups['tacker_all'][0]]['ansible_host'] }}:{{ tacker_service_port }}" -tacker_aodh_enabled: false -tacker_gnocchi_enabled: false -tacker_oslomsg_rpc_password: "secrete" -tacker_oslomsg_notify_password: "{{ tacker_oslomsg_rpc_password }}" +tacker_oslomsg_rpc_password: "{{ oslomsg_rpc_password }}" tacker_service_password: "secrete" tacker_container_mysql_password: "secrete" tacker_developer_mode: true diff --git a/tests/test-install-tacker.yml b/tests/test-install-tacker.yml index 07eed23..807a609 100644 --- a/tests/test-install-tacker.yml +++ b/tests/test-install-tacker.yml @@ -18,15 +18,7 @@ remote_user: root gather_facts: true any_errors_fatal: true - pre_tasks: - - include: common/ensure-oslomsg.yml - rpc_vhost: "{{ tacker_oslomsg_rpc_vhost }}" - rpc_user: "{{ tacker_oslomsg_rpc_userid }}" - rpc_password: "{{ tacker_oslomsg_rpc_password }}" - notify_vhost: "{{ tacker_oslomsg_notify_vhost }}" - notify_user: "{{ tacker_oslomsg_notify_userid }}" - notify_password: "{{ tacker_oslomsg_notify_password }}" - roles: - - role: os_tacker vars_files: - common/test-vars.yml + roles: + - role: os_tacker