cf-charmers team mailing list archive

[Cory Johns <cory.johns@xxxxxxxxxxxxx>]

Cory Johns has proposed merging lp:~johnsca/charms/bundles/cloudfoundry/port-conflicts 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/port-conflicts/+merge/222672

Bundle changes to resolve port conflicts



https://codereview.appspot.com/106920044/

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

=== modified file 'bundles.yaml'
--- bundles.yaml	2014-06-05 09:28:57 +0000
+++ bundles.yaml	2014-06-10 15:55:59 +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
@@ -34,11 +34,16 @@
       charm: mysql
       branch: lp:~cf-charmers/charms/trusty/mysql/trunk
       constraints: "arch=amd64"
-    broker:
-      charm: cf-mysql-broker
-      branch: lp:~cf-charmers/charms/trusty/cf-mysql-broker/trunk
+    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:
+<<<<<<< TREE
     - [router, [cc, uaa, logrouter, dea, broker]]
     - [nats, [cc, uaa, router, loggregator, logrouter, dea, broker]]
     - [loggregator, [dea, logrouter]]
@@ -49,48 +54,45 @@
   services:
     dea:
       to: kvm:0
+=======
+    - ['router:router', [cc, uaa, logrouter, dea]]
+    - [nats, [cc, uaa, router, loggregator, logrouter, dea]]
+    - ['logrouter:logrouter', [router, dea, loggregator]]
+    - ['logrouter:loggregator', [loggregator]]
+    - [mysql, [cc]]
+    - [hm, [etcd, cc, nats]]
+>>>>>>> MERGE-SOURCE
 
 single-aws-node:
   inherits: [base]
   services:
     nats:
-      charm: cf-nats
-      branch: lp:~cf-charmers/charms/trusty/cf-nats/trunk
-      constraints: "arch=amd64"
       to: 0
     cc:
-      charm: cf-cloud-controller
-      branch: lp:~cf-charmers/charms/trusty/cf-cloud-controller/trunk
-      constraints: "arch=amd64"
       to: 0
     mysql:
-      charm: mysql
-      branch: lp:~charmers/charms/precise/mysql/trunk
       to: 0
     dea:
-      charm: cf-dea
-      branch: lp:~cf-charmers/charms/trusty/cf-dea/trunk
-      constraints: "arch=amd64"
       to: 0
+      options:
+        varz_port: 8881
     uaa:
-      charm: cf-uaa
-      branch: lp:~cf-charmers/charms/trusty/cf-uaa/trunk
-      constraints: "arch=amd64"
       to: 0
     router:
-      charm: cf-go-router
-      branch: lp:~cf-charmers/charms/trusty/cf-go-router/trunk
-      constraints: "arch=amd64"
-      expose: true
       to: 0
     logrouter:
-      charm: cf-logrouter
-      branch: lp:~cf-charmers/charms/trusty/cf-logrouter/trunk
-      constraints: "arch=amd64"
       to: 0
+      options:
+        incoming_port: 3456
+        outgoing_port: 8083
+        varz_port: 8882
     loggregator:
-      charm: cf-loggregator
-      branch: lp:~cf-charmers/charms/trusty/cf-loggregator/trunk
-      constraints: "arch=amd64"
-      to: 0
-
+      to: 0
+      options:
+        incoming_port: 3457
+        outgoing_port: 8082
+        varz_port: 8883
+    etcd:
+      to: 0
+    hm:
+      to: 0