Merge "Use custom role names in deployed-server roles"

[apex-tripleo-heat-templates.git] / puppet / services / rabbitmq.yaml

diff --git a/puppet/services/rabbitmq.yaml b/puppet/services/rabbitmq.yaml
index 08f3f6b..ab9dad4 100644 (file)
--- a/puppet/services/rabbitmq.yaml
+++ b/puppet/services/rabbitmq.yaml
@@ -1,4 +1,4 @@
-heat_template_version: 2016-10-14
+heat_template_version: ocata
 
 description: >
   RabbitMQ service configured with Puppet
@@ -69,6 +69,7 @@ outputs:
         rabbitmq::delete_guest_user: false
         rabbitmq::wipe_db_on_cookie_change: true
         rabbitmq::port: '5672'
+        rabbitmq::package_provider: yum
         rabbitmq::package_source: undef
         rabbitmq::repos_ensure: false
         rabbitmq::tcp_keepalive: true
@@ -106,6 +107,6 @@ outputs:
           tags: step2
           service: name=rabbitmq-server state=stopped
         - name: Start rabbitmq service
-          tags: step6
+          tags: step4
           service: name=rabbitmq-server state=started