Merge "Move MQ vhost/user creation into role"
This commit is contained in:
commit
d97fa0fd53
@ -197,10 +197,12 @@ swift_reselleradmin_role: ResellerAdmin
|
||||
## Oslo Messaging
|
||||
|
||||
# Notify
|
||||
swift_oslomsg_notify_transport: rabbit
|
||||
swift_oslomsg_notify_servers: 127.0.0.1
|
||||
swift_oslomsg_notify_port: 5672
|
||||
swift_oslomsg_notify_use_ssl: False
|
||||
swift_oslomsg_notify_host_group: "{{ oslomsg_notify_host_group | default('rabbitmq_all') }}"
|
||||
swift_oslomsg_notify_setup_host: "{{ (swift_oslomsg_notify_host_group in groups) | ternary(groups[swift_oslomsg_notify_host_group][0], 'localhost') }}"
|
||||
swift_oslomsg_notify_transport: "{{ oslomsg_notify_transport | default('rabbit') }}"
|
||||
swift_oslomsg_notify_servers: "{{ oslomsg_notify_servers | default('127.0.0.1') }}"
|
||||
swift_oslomsg_notify_port: "{{ oslomsg_notify_port | default('5672') }}"
|
||||
swift_oslomsg_notify_use_ssl: "{{ oslomsg_notify_use_ssl | default(False) }}"
|
||||
swift_oslomsg_notify_userid: swift
|
||||
swift_oslomsg_notify_vhost: /swift
|
||||
|
||||
|
@ -115,6 +115,20 @@
|
||||
- swift-config
|
||||
- systemd-service
|
||||
|
||||
- include_tasks: mq_setup.yml
|
||||
when:
|
||||
- "swift_services['swift-proxy-server']['group'] in group_names"
|
||||
- "inventory_hostname == ((groups[swift_services['swift-proxy-server']['group']]| intersect(ansible_play_hosts)) | list)[0]"
|
||||
with_items:
|
||||
- oslomsg_setup_host: "{{ swift_oslomsg_notify_setup_host }}"
|
||||
oslomsg_userid: "{{ swift_oslomsg_notify_userid }}"
|
||||
oslomsg_password: "{{ swift_oslomsg_notify_password }}"
|
||||
oslomsg_vhost: "{{ swift_oslomsg_notify_vhost }}"
|
||||
oslomsg_transport: "{{ swift_oslomsg_notify_transport }}"
|
||||
no_log: true
|
||||
tags:
|
||||
- swift-config
|
||||
|
||||
- include_tasks: swift_service_setup.yml
|
||||
when:
|
||||
- "swift_do_setup | bool"
|
||||
|
45
tasks/mq_setup.yml
Normal file
45
tasks/mq_setup.yml
Normal file
@ -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
|
Loading…
x
Reference in New Issue
Block a user