From d13dde8afbe3c5317ffb1fa25d8ff4e67e7c65e9 Mon Sep 17 00:00:00 2001
From: kevin <kevin.carter@rackspace.com>
Date: Thu, 16 Jul 2015 14:55:47 -0500
Subject: [PATCH] Compartmentalizing RabbitMQ
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Presently all services use the single root virtual host within RabbitMQ
and while this is “OK” for small to mid sized deployments however it
would be better to divide services into logical resource groups within
RabbitMQ which will bring with it additional security. This change set
provides OSAD better compartmentalization of consumer services that use
RabbitMQ.

UpgradeImpact
DocImpact
Change-Id: I6f9d07522faf133f3c1c84a5b9046a55d5789e52
Implements: blueprint compartmentalize-rabbitmq
---
 defaults/main.yml              |  4 ++++
 tasks/nova_messaging_setup.yml | 37 ++++++++++++++++++++++++++++++++++
 tasks/nova_pre_install.yml     |  4 ++++
 templates/nova.conf.j2         |  6 +++---
 4 files changed, 48 insertions(+), 3 deletions(-)
 create mode 100644 tasks/nova_messaging_setup.yml

diff --git a/defaults/main.yml b/defaults/main.yml
index f445c17b..9f5308bd 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -38,6 +38,10 @@ nova_db_max_overflow: 10
 nova_db_max_pool_size: 120
 nova_db_pool_timeout: 30
 
+## RabbitMQ info
+nova_rabbitmq_userid: nova
+nova_rabbitmq_vhost: /nova
+
 ## RPC
 nova_rpc_backend: nova.openstack.common.rpc.impl_kombu
 nova_rpc_thread_pool_size: 64
diff --git a/tasks/nova_messaging_setup.yml b/tasks/nova_messaging_setup.yml
new file mode 100644
index 00000000..19d71382
--- /dev/null
+++ b/tasks/nova_messaging_setup.yml
@@ -0,0 +1,37 @@
+---
+# 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.
+
+- name: Ensure Rabbitmq vhost
+  rabbitmq_vhost:
+    name: "{{ nova_rabbitmq_vhost }}"
+    state: "present"
+  delegate_to: "{{ groups['rabbitmq_all'][0] }}"
+  tags:
+    - nova-rabbitmq
+    - nova-rabbitmq-vhost
+
+- name: Ensure rabbitmq user
+  rabbitmq_user:
+    user: "{{ nova_rabbitmq_userid }}"
+    password: "{{ nova_rabbitmq_password }}"
+    vhost: "{{ nova_rabbitmq_vhost }}"
+    configure_priv: ".*"
+    read_priv: ".*"
+    write_priv: ".*"
+    state: "present"
+  delegate_to: "{{ groups['rabbitmq_all'][0] }}"
+  tags:
+    - nova-rabbitmq
+    - nova-rabbitmq-user
diff --git a/tasks/nova_pre_install.yml b/tasks/nova_pre_install.yml
index e17dc7bf..425f8a40 100644
--- a/tasks/nova_pre_install.yml
+++ b/tasks/nova_pre_install.yml
@@ -109,3 +109,7 @@
   tags:
     - sudoers
     - nova-sudoers
+
+- include: nova_messaging_setup.yml
+  when: >
+    inventory_hostname == groups['nova_all'][0]
diff --git a/templates/nova.conf.j2 b/templates/nova.conf.j2
index 8ddc49a7..205664b0 100644
--- a/templates/nova.conf.j2
+++ b/templates/nova.conf.j2
@@ -226,10 +226,10 @@ lock_path = /var/lock/nova
 
 
 [oslo_messaging_rabbit]
-amqp_auto_delete = False
 rabbit_port = {{ rabbitmq_port }}
-rabbit_userid = {{ rabbitmq_userid }}
-rabbit_password = {{ rabbitmq_password }}
+rabbit_userid = {{ nova_rabbitmq_userid }}
+rabbit_password = {{ nova_rabbitmq_password }}
+rabbit_virtual_host = {{ nova_rabbitmq_vhost }}
 rabbit_hosts = {{ rabbitmq_servers }}