From 7564788f7bd180401d0394886c7c5262ac4dc025 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Ole=C5=9B?= <loles@mirantis.com>
Date: Fri, 17 Jul 2015 11:49:12 +0000
Subject: [PATCH] Fix rabbitmq startup

Rabbitmq start with the default node name. Puppet tries to change nodename.
After this start stop status stops to work
---
 resources/rabbitmq_service/actions/run.pp   | 6 +-----
 resources/rabbitmq_user/actions/remove.yml  | 1 -
 resources/rabbitmq_user/actions/run.yml     | 1 -
 resources/rabbitmq_user/meta.yaml           | 3 ---
 resources/rabbitmq_vhost/actions/remove.yml | 1 -
 resources/rabbitmq_vhost/actions/run.yml    | 1 -
 resources/rabbitmq_vhost/meta.yaml          | 3 ---
 7 files changed, 1 insertion(+), 15 deletions(-)

diff --git a/resources/rabbitmq_service/actions/run.pp b/resources/rabbitmq_service/actions/run.pp
index 807f93b..befa93d 100644
--- a/resources/rabbitmq_service/actions/run.pp
+++ b/resources/rabbitmq_service/actions/run.pp
@@ -5,12 +5,8 @@ $management_port = "${resource['input']['management_port']['value']}"
 $node_name = $resource['input']['node_name']['value']
 
 class { '::rabbitmq':
-  service_manage    => false,
+  service_manage    => true,
   port              => $port,
   management_port   => $management_port,
   delete_guest_user => true,
-  environment_variables   => {
-    'RABBITMQ_NODENAME'     => $node_name,
-    'RABBITMQ_SERVICENAME'  => 'RabbitMQ'
-  }
 }
diff --git a/resources/rabbitmq_user/actions/remove.yml b/resources/rabbitmq_user/actions/remove.yml
index 7e1d80e..b73859b 100644
--- a/resources/rabbitmq_user/actions/remove.yml
+++ b/resources/rabbitmq_user/actions/remove.yml
@@ -4,4 +4,3 @@
     - new_rabbitmq_user: user={{user_name}}
                          vhost={{vhost_name}}
                          state=absent
-                         node={{node_name}}
diff --git a/resources/rabbitmq_user/actions/run.yml b/resources/rabbitmq_user/actions/run.yml
index 46fc5bf..bc5c3e5 100644
--- a/resources/rabbitmq_user/actions/run.yml
+++ b/resources/rabbitmq_user/actions/run.yml
@@ -8,4 +8,3 @@
                          read_priv=.*
                          write_priv=.*
                          state=present
-                         node={{node_name}}
diff --git a/resources/rabbitmq_user/meta.yaml b/resources/rabbitmq_user/meta.yaml
index b5be384..d7185aa 100644
--- a/resources/rabbitmq_user/meta.yaml
+++ b/resources/rabbitmq_user/meta.yaml
@@ -2,9 +2,6 @@ id: rabbitmq_user
 handler: ansible
 version: 1.0.0
 input:
-    node_name:
-      schema: str!
-      value:
     user_name:
       schema: str!
       value: openstack
diff --git a/resources/rabbitmq_vhost/actions/remove.yml b/resources/rabbitmq_vhost/actions/remove.yml
index 8103852..8dcefd7 100644
--- a/resources/rabbitmq_vhost/actions/remove.yml
+++ b/resources/rabbitmq_vhost/actions/remove.yml
@@ -3,4 +3,3 @@
   tasks:
     - new_rabbitmq_vhost: name={{vhost_name}}
                           state=absent
-                          node={{node_name}}
diff --git a/resources/rabbitmq_vhost/actions/run.yml b/resources/rabbitmq_vhost/actions/run.yml
index ac45faf..52b8bb2 100644
--- a/resources/rabbitmq_vhost/actions/run.yml
+++ b/resources/rabbitmq_vhost/actions/run.yml
@@ -2,5 +2,4 @@
   sudo: yes
   tasks:
       - new_rabbitmq_vhost: name={{vhost_name}}
-                            node={{node_name}}
                             state=present
diff --git a/resources/rabbitmq_vhost/meta.yaml b/resources/rabbitmq_vhost/meta.yaml
index 313f20a..8291f2a 100644
--- a/resources/rabbitmq_vhost/meta.yaml
+++ b/resources/rabbitmq_vhost/meta.yaml
@@ -2,9 +2,6 @@ id: rabbitmq_vhost
 handler: ansible
 version: 1.0.0
 input:
-    node_name:
-      schema: str!
-      value:
     vhost_name:
       schema: str!
       value: openstack