Merge "Remove the messaging tasks from the role"

tasks/glance_messaging_setup.yml

@@ -1,37 +0,0 @@
----
-# 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: "{{ glance_rabbitmq_vhost }}"
-    state: "present"
-  delegate_to: "{{ groups['rabbitmq_all'][0] }}"
-  tags:
-    - glance-rabbitmq
-    - glance-rabbitmq-vhost
-
-- name: Ensure rabbitmq user
-  rabbitmq_user:
-    user: "{{ glance_rabbitmq_userid }}"
-    password: "{{ glance_rabbitmq_password }}"
-    vhost: "{{ glance_rabbitmq_vhost }}"
-    configure_priv: ".*"
-    read_priv: ".*"
-    write_priv: ".*"
-    state: "present"
-  delegate_to: "{{ groups['rabbitmq_all'][0] }}"
-  tags:
-    - glance-rabbitmq
-    - glance-rabbitmq-user

tasks/glance_pre_install.yml

@@ -89,7 +89,3 @@
   tags:
     - glance-dirs
     - glance-logs
-
-- include: glance_messaging_setup.yml
-  when: >
-    inventory_hostname == groups['glance_all'][0]