Merge "Compartmentalizing RabbitMQ"

defaults/main.yml

@@ -36,6 +36,11 @@ ceilometer_db_port: 27017
 ceilometer_connection_string: "{{ ceilometer_db_type }}://{{ ceilometer_database_user }}:{{ ceilometer_container_db_password }}@{{ ceilometer_db_ip }}:{{ ceilometer_db_port }}/{{ ceilometer_database_name }}"
 
 
+## RabbitMQ info
+ceilometer_rabbitmq_userid: ceilometer
+ceilometer_rabbitmq_vhost: /ceilometer
+
+
 #Ceilometer services info
 ceilometer_role_name: admin
 ceilometer_api_host_address: 0.0.0.0

tasks/ceilometer_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: "{{ ceilometer_rabbitmq_vhost }}"
+    state: "present"
+  delegate_to: "{{ groups['rabbitmq_all'][0] }}"
+  tags:
+    - ceilometer-rabbitmq
+    - ceilometer-rabbitmq-vhost
+
+- name: Ensure rabbitmq user
+  rabbitmq_user:
+    user: "{{ ceilometer_rabbitmq_userid }}"
+    password: "{{ ceilometer_rabbitmq_password }}"
+    vhost: "{{ ceilometer_rabbitmq_vhost }}"
+    configure_priv: ".*"
+    read_priv: ".*"
+    write_priv: ".*"
+    state: "present"
+  delegate_to: "{{ groups['rabbitmq_all'][0] }}"
+  tags:
+    - ceilometer-rabbitmq
+    - ceilometer-rabbitmq-user

tasks/ceilometer_pre_install.yml

@@ -100,3 +100,7 @@
   tags:
     - sudoers
     - ceilometer-sudoers
+
+- include: ceilometer_messaging_setup.yml
+  when: >
+    inventory_hostname == groups['ceilometer_api'][0]

templates/ceilometer.conf.j2

@@ -12,8 +12,9 @@ policy_file = /etc/ceilometer/policy.json
 [oslo_messaging_rabbit]
 rpc_backend = rabbit
 rabbit_port = {{ rabbitmq_port }}
-rabbit_userid = {{ rabbitmq_userid }}
-rabbit_password = {{ rabbitmq_password }}
+rabbit_userid = {{ ceilometer_rabbitmq_userid }}
+rabbit_password = {{ ceilometer_rabbitmq_password }}
+rabbit_virtual_host = {{ ceilometer_rabbitmq_vhost }}
 rabbit_hosts = {{ rabbitmq_servers }}
 
 [api]