cf-charmers team mailing list archive

[Cory Johns <cory.johns@xxxxxxxxxxxxx>]

Cory Johns has proposed merging lp:~johnsca/charms/bundles/cloudfoundry/hm9k into lp:~cf-charmers/charms/bundles/cloudfoundry/bundle.

Requested reviews:
  Cloud Foundry Charmers (cf-charmers)

For more details, see:
https://code.launchpad.net/~johnsca/charms/bundles/cloudfoundry/hm9k/+merge/221772

Bundle changes for HM9000

Obviously, charm path changes are temporary for testing and will need to be
changed prior to merging.

https://codereview.appspot.com/105760044/

-- 
https://code.launchpad.net/~johnsca/charms/bundles/cloudfoundry/hm9k/+merge/221772
Your team Cloud Foundry Charmers is requested to review the proposed merge of lp:~johnsca/charms/bundles/cloudfoundry/hm9k into lp:~cf-charmers/charms/bundles/cloudfoundry/bundle.

=== modified file 'bundles.yaml'
--- bundles.yaml	2014-05-30 14:42:03 +0000
+++ bundles.yaml	2014-06-02 17:52:34 +0000
@@ -7,7 +7,7 @@
       constraints: "arch=amd64"
     cc:
       charm: cf-cloud-controller
-      branch: lp:~cf-charmers/charms/trusty/cf-cloud-controller/trunk
+      branch: lp:~johnsca/charms/trusty/cf-cloud-controller/hm9k
       constraints: "arch=amd64"
     dea:
       charm: cf-dea
@@ -39,11 +39,20 @@
       charm: cf-mysql-broker
       branch: lp:~cf-charmers/charms/trusty/cf-mysql-broker/trunk
       constraints: "arch=amd64"
+    etcd:
+      charm: etcd
+      branch: lp:~hazmat/charms/trusty/etcd/trunk
+      constraints: "arch=amd64"
+    hm:
+      charm: cf-hm9000
+      branch: lp:~johnsca/charms/trusty/cf-hm9000/services
+      constraints: "arch=amd64"
   relations:
     - [router, [cc, uaa, logrouter, dea, broker]]
     - [nats, [cc, uaa, router, loggregator, logrouter, dea, broker]]
     - [loggregator, [dea, logrouter]]
-    - [mysql, [cc, broker]]     
+    - [mysql, [cc, broker]]
+    - [hm, [etcd, cc, nats]]
 
 single-aws-node:
   inherits: [base]
@@ -88,4 +97,13 @@
       branch: lp:~cf-charmers/charms/trusty/cf-loggregator/trunk
       constraints: "arch=amd64"
       to: 0
-
+    etcd:
+      charm: etcd
+      branch: lp:~hazmat/charms/trusty/etcd/trunk
+      constraints: "arch=amd64"
+      to: 0
+    hm:
+      charm: cf-hm9000
+      branch: lp:~johnsca/charms/trusty/cf-hm9000/services
+      constraints: "arch=amd64"
+      to: 0