From ddde7d01b567ce106031a7d68f02719618ded8c3 Mon Sep 17 00:00:00 2001
From: Kevin Carter <kevin.carter@rackspace.com>
Date: Thu, 3 Mar 2016 14:06:51 -0600
Subject: [PATCH] Remove the messaging tasks from the role

This change removes the messageing tasks from this role because
they will be relocated into the play in OpenStack-Ansible.

Change-Id: Icf22d6c7bf02f360a5138aa9f6bb3a421078e9ac
Depends-On: I3016039692d8130654fe1bff422f24ef2afc196e
Signed-off-by: Kevin Carter <kevin.carter@rackspace.com>
---
 tasks/glance_messaging_setup.yml | 37 --------------------------------
 tasks/glance_pre_install.yml     |  4 ----
 2 files changed, 41 deletions(-)
 delete mode 100644 tasks/glance_messaging_setup.yml

diff --git a/tasks/glance_messaging_setup.yml b/tasks/glance_messaging_setup.yml
deleted file mode 100644
index ed589f59..00000000
--- a/tasks/glance_messaging_setup.yml
+++ /dev/null
@@ -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
diff --git a/tasks/glance_pre_install.yml b/tasks/glance_pre_install.yml
index 46864136..c60d847e 100644
--- a/tasks/glance_pre_install.yml
+++ b/tasks/glance_pre_install.yml
@@ -92,7 +92,3 @@
   tags:
     - glance-dirs
     - glance-logs
-
-- include: glance_messaging_setup.yml
-  when: >
-    inventory_hostname == groups['glance_all'][0]