diff --git a/defaults/main.yml b/defaults/main.yml index c2fd81c..7360dc7 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -112,18 +112,22 @@ barbican_galera_ssl_ca_cert: "{{ galera_ssl_ca_cert | default('/etc/ssl/certs/ga ## Oslo Messaging # RPC -barbican_oslomsg_rpc_transport: rabbit -barbican_oslomsg_rpc_servers: 127.0.0.1 -barbican_oslomsg_rpc_port: 5672 -barbican_oslomsg_rpc_use_ssl: false +barbican_oslomsg_rpc_host_group: "{{ oslomsg_rpc_host_group | default('rabbitmq_all') }}" +barbican_oslomsg_rpc_setup_host: "{{ (barbican_oslomsg_rpc_host_group in groups) | ternary(groups[barbican_oslomsg_rpc_host_group][0], 'localhost') }}" +barbican_oslomsg_rpc_transport: "{{ oslomsg_rpc_transport | default('rabbit') }}" +barbican_oslomsg_rpc_servers: "{{ oslomsg_rpc_servers | default('127.0.0.1') }}" +barbican_oslomsg_rpc_port: "{{ oslomsg_rpc_port | default('5672') }}" +barbican_oslomsg_rpc_use_ssl: "{{ oslomsg_rpc_use_ssl | default(False) }}" barbican_oslomsg_rpc_userid: barbican barbican_oslomsg_rpc_vhost: /barbican # Notify -barbican_oslomsg_notify_transport: rabbit -barbican_oslomsg_notify_servers: 127.0.0.1 -barbican_oslomsg_notify_port: 5672 -barbican_oslomsg_notify_use_ssl: false +barbican_oslomsg_notify_host_group: "{{ oslomsg_notify_host_group | default('rabbitmq_all') }}" +barbican_oslomsg_notify_setup_host: "{{ (barbican_oslomsg_notify_host_group in groups) | ternary(groups[barbican_oslomsg_notify_host_group][0], 'localhost') }}" +barbican_oslomsg_notify_transport: "{{ oslomsg_notify_transport | default('rabbit') }}" +barbican_oslomsg_notify_servers: "{{ oslomsg_notify_servers | default('127.0.0.1') }}" +barbican_oslomsg_notify_port: "{{ oslomsg_notify_port | default('5672') }}" +barbican_oslomsg_notify_use_ssl: "{{ oslomsg_notify_use_ssl | default(False) }}" barbican_oslomsg_notify_userid: "{{ barbican_oslomsg_rpc_userid }}" barbican_oslomsg_notify_password: "{{ barbican_oslomsg_rpc_password }}" barbican_oslomsg_notify_vhost: "{{ barbican_oslomsg_rpc_vhost }}" diff --git a/tasks/main.yml b/tasks/main.yml index 9068611..5ad7a9c 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -57,13 +57,33 @@ tags: - barbican-config +- include_tasks: mq_setup.yml + when: + - inventory_hostname == groups['barbican_all'][0] + with_items: + - oslomsg_setup_host: "{{ barbican_oslomsg_rpc_setup_host }}" + oslomsg_userid: "{{ barbican_oslomsg_rpc_userid }}" + oslomsg_password: "{{ barbican_oslomsg_rpc_password }}" + oslomsg_vhost: "{{ barbican_oslomsg_rpc_vhost }}" + oslomsg_transport: "{{ barbican_oslomsg_rpc_transport }}" + - oslomsg_setup_host: "{{ barbican_oslomsg_notify_setup_host }}" + oslomsg_userid: "{{ barbican_oslomsg_notify_userid }}" + oslomsg_password: "{{ barbican_oslomsg_notify_password }}" + oslomsg_vhost: "{{ barbican_oslomsg_notify_vhost }}" + oslomsg_transport: "{{ barbican_oslomsg_notify_transport }}" + no_log: true + tags: + - barbican-config + - include: barbican_db_setup.yml - when: inventory_hostname == groups['barbican_all'][0] + when: + - inventory_hostname == groups['barbican_all'][0] tags: - barbican-config - include: barbican_service_setup.yml - when: inventory_hostname == groups['barbican_all'][0] + when: + - inventory_hostname == groups['barbican_all'][0] tags: - barbican-config 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_barbican-overrides.yml b/tests/os_barbican-overrides.yml index f370e7e..5da8623 100644 --- a/tests/os_barbican-overrides.yml +++ b/tests/os_barbican-overrides.yml @@ -15,17 +15,10 @@ barbican_galera_password: SuperSecrete barbican_developer_mode: true -barbican_galera_address: "{{ hostvars[groups['galera_all'][0]]['ansible_host'] }}" -barbican_galera_database: barbican +barbican_galera_address: "{{ test_galera_host }}" barbican_keystone_auth: yes -barbican_oslomsg_rpc_vhost: /barbican -barbican_oslomsg_rpc_userid: barbican barbican_oslomsg_rpc_password: secrete -barbican_oslomsg_notify_vhost: "{{ barbican_oslomsg_rpc_vhost }}" -barbican_oslomsg_notify_userid: "{{ barbican_oslomsg_rpc_userid }}" -barbican_oslomsg_notify_password: "{{ barbican_oslomsg_rpc_password }}" barbican_service_password: secrete -barbican_venv_tag: testing barbican_service_publicurl: "http://{{ hostvars[groups['barbican_all'][0]]['ansible_host'] }}:9311" barbican_service_internalurl: "{{ barbican_service_publicurl }}" diff --git a/tests/test-install-barbican.yml b/tests/test-install-barbican.yml index 8a27c24..50ea34d 100644 --- a/tests/test-install-barbican.yml +++ b/tests/test-install-barbican.yml @@ -17,16 +17,7 @@ hosts: barbican_all user: root gather_facts: true - pre_tasks: - - include: common/ensure-oslomsg.yml - rpc_vhost: "{{ barbican_oslomsg_rpc_vhost }}" - rpc_user: "{{ barbican_oslomsg_rpc_userid }}" - rpc_password: "{{ barbican_oslomsg_rpc_password }}" - notify_vhost: "{{ barbican_oslomsg_notify_vhost }}" - notify_user: "{{ barbican_oslomsg_notify_userid }}" - notify_password: "{{ barbican_oslomsg_notify_password }}" - - roles: - - role: "os_barbican" vars_files: - common/test-vars.yml + roles: + - role: "os_barbican"