Skip to content

Commit

Permalink
Move MQ vhost/user creation into role
Browse files Browse the repository at this point in the history
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:
 - glance_oslomsg_rpc_setup_host
 - glance_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.

Needed-By: https://review.openstack.org/568522
Needed-By: https://review.openstack.org/568531
Change-Id: Ib112cb8e30ff3cfd5b8fb12ae8fe57a3e834fbf1
  • Loading branch information
Jesse Pretorius committed Jul 3, 2018
1 parent 7958d16 commit ae5fd94
Show file tree
Hide file tree
Showing 3 changed files with 76 additions and 10 deletions.
22 changes: 12 additions & 10 deletions defaults/main.yml
Expand Up @@ -93,20 +93,22 @@ glance_enable_v2_registry: False
## Oslo Messaging Info

# RPC

glance_oslomsg_rpc_transport: rabbit
glance_oslomsg_rpc_servers: 127.0.0.1
glance_oslomsg_rpc_port: 5672
glance_oslomsg_rpc_use_ssl: False
glance_oslomsg_rpc_host_group: "{{ oslomsg_rpc_host_group | default('rabbitmq_all') }}"
glance_oslomsg_rpc_setup_host: "{{ (glance_oslomsg_rpc_host_group in groups) | ternary(groups[glance_oslomsg_rpc_host_group][0], 'localhost') }}"
glance_oslomsg_rpc_transport: "{{ oslomsg_rpc_transport | default('rabbit') }}"
glance_oslomsg_rpc_servers: "{{ oslomsg_rpc_servers | default('127.0.0.1') }}"
glance_oslomsg_rpc_port: "{{ oslomsg_rpc_port | default('5672') }}"
glance_oslomsg_rpc_use_ssl: "{{ oslomsg_rpc_use_ssl | default(False) }}"
glance_oslomsg_rpc_userid: glance
glance_oslomsg_rpc_vhost: /glance

# Notify

glance_oslomsg_notify_transport: rabbit
glance_oslomsg_notify_servers: 127.0.0.1
glance_oslomsg_notify_port: 5672
glance_oslomsg_notify_use_ssl: False
glance_oslomsg_notify_host_group: "{{ oslomsg_rpc_host_group | default('rabbitmq_all') }}"
glance_oslomsg_notify_setup_host: "{{ (glance_oslomsg_rpc_host_group in groups) | ternary(groups[glance_oslomsg_rpc_host_group][0], 'localhost') }}"
glance_oslomsg_notify_transport: "{{ oslomsg_rpc_transport | default('rabbit') }}"
glance_oslomsg_notify_servers: "{{ oslomsg_rpc_servers | default('127.0.0.1') }}"
glance_oslomsg_notify_port: "{{ oslomsg_rpc_port | default('5672') }}"
glance_oslomsg_notify_use_ssl: "{{ oslomsg_rpc_use_ssl | default(False) }}"
glance_oslomsg_notify_userid: glance
glance_oslomsg_notify_vhost: /glance

Expand Down
19 changes: 19 additions & 0 deletions tasks/main.yml
Expand Up @@ -48,6 +48,25 @@
tags:
- glance-config

- include_tasks: mq_setup.yml
when:
- "glance_services['glance-api']['group'] in group_names"
- "inventory_hostname == ((groups[glance_services['glance-api']['group']]| intersect(ansible_play_hosts)) | list)[0]"
with_items:
- oslomsg_setup_host: "{{ glance_oslomsg_rpc_setup_host }}"
oslomsg_userid: "{{ glance_oslomsg_rpc_userid }}"
oslomsg_password: "{{ glance_oslomsg_rpc_password }}"
oslomsg_vhost: "{{ glance_oslomsg_rpc_vhost }}"
oslomsg_transport: "{{ glance_oslomsg_rpc_transport }}"
- oslomsg_setup_host: "{{ glance_oslomsg_notify_setup_host }}"
oslomsg_userid: "{{ glance_oslomsg_notify_userid }}"
oslomsg_password: "{{ glance_oslomsg_notify_password }}"
oslomsg_vhost: "{{ glance_oslomsg_notify_vhost }}"
oslomsg_transport: "{{ glance_oslomsg_notify_transport }}"
no_log: true
tags:
- glance-config

- include_tasks: glance_db_setup.yml
when:
- "glance_services['glance-api']['group'] in group_names"
Expand Down
45 changes: 45 additions & 0 deletions tasks/mq_setup.yml
@@ -0,0 +1,45 @@
---
# Copyright 2014, 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

0 comments on commit ae5fd94

Please sign in to comment.