Merge "Bump service with rabbit multiversion"

cloudfoundry-attic · Nov 30, 2012 · 4a07bf0 · 4a07bf0
2 parents 376513e + 298d504
commit 4a07bf0
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 2 deletions.
diff --git a/jobs/rabbit_node/spec b/jobs/rabbit_node/spec
@@ -14,6 +14,7 @@ packages:
   - common
   - erlang
   - rabbitmq
+  - rabbitmq-2.8
   - ruby
   - sqlite
   - rabbit_node

diff --git a/jobs/rabbit_node/templates/rabbit_node.yml.erb b/jobs/rabbit_node/templates/rabbit_node.yml.erb
@@ -42,7 +42,16 @@ port_range:
 admin_port_range:
   first: 20001
   last: 30000
-rabbitmq_server: /var/vcap/packages/rabbitmq/sbin/rabbitmq-server
+supported_versions: <%= "['#{supported_versions.join("' , '")}']" %>
+default_version: <%= "'#{default_version}'"%>
+rabbit:
+  '2.4':
+    config_template: ../../../resources/rabbitmq24.config.erb
+    rabbitmq_server: /var/vcap/packages/rabbitmq/sbin/rabbitmq-server
+  '2.8':
+    config_template: ../../../resources/rabbitmq28.config.erb
+    rabbitmq_server: /var/vcap/packages/rabbitmq-2.8/sbin/rabbitmq-server
+    disk_free_limit: 13421772
 rabbitmq_log_dir: /var/vcap/sys/service-log/rabbit
 rabbitmq_start_timeout: <%= node.rabbitmq_start_timeout || 5 %>
 fqdn_hosts: <%= properties.services && properties.services.fqdn_hosts || "false" %>

diff --git a/src/services b/src/services