From 1ce8ca50f704794e1a98333884618b2711b4dcb8 Mon Sep 17 00:00:00 2001 From: Vladimir Kuklin Date: Tue, 3 Dec 2013 11:08:44 +0400 Subject: [PATCH] Revert "Merge pull request #886 from dmitryilyin/mco-curl" This reverts commit f98ba64b39350669616e90bb01061e33cb61635a, reversing changes made to 8ef5a49eb47d7cea1e1757dedceeeb97cf8d33d8. --- deployment/puppet/mcollective/manifests/rabbitmq.pp | 6 ------ 1 file changed, 6 deletions(-) diff --git a/deployment/puppet/mcollective/manifests/rabbitmq.pp b/deployment/puppet/mcollective/manifests/rabbitmq.pp index 43269e0b82..7e98168289 100644 --- a/deployment/puppet/mcollective/manifests/rabbitmq.pp +++ b/deployment/puppet/mcollective/manifests/rabbitmq.pp @@ -107,9 +107,6 @@ class mcollective::rabbitmq ( logoutput => true, require => [Service['rabbitmq-server'], Rabbitmq_user_permissions["${user}@${actual_vhost}"]], path => '/bin:/usr/bin:/sbin:/usr/sbin', - tries => 10, - try_sleep => 3, - unless => "curl -I -u ${user}:${password} http://localhost:${management_port}/api/exchanges/${actual_vhost}/mcollective_directed", } exec { 'create-mcollective-broadcast-exchange': @@ -118,9 +115,6 @@ class mcollective::rabbitmq ( logoutput => true, require => [Service['rabbitmq-server'], Rabbitmq_user_permissions["${user}@${actual_vhost}"]], path => '/bin:/usr/bin:/sbin:/usr/sbin', - tries => 10, - try_sleep => 3, - unless => "curl -I -u ${user}:${password} http://localhost:${management_port}/api/exchanges/${actual_vhost}/mcollective_broadcast", } }