cf-charmers team mailing list archive

[Cory Johns <cory.johns@xxxxxxxxxxxxx>]

Reviewers: mp+222672_code.launchpad.net,

Message:
Please take a look.

Description:
Bundle changes to resolve port conflicts



https://code.launchpad.net/~johnsca/charms/bundles/cloudfoundry/port-conflicts/+merge/222672

(do not edit description out of merge proposal)


Please review this at https://codereview.appspot.com/106920044/

Affected files (+31, -34 lines):
   A [revision details]
   M bundles.yaml


Index: [revision details]
=== added file '[revision details]'
--- [revision details]	2012-01-01 00:00:00 +0000
+++ [revision details]	2012-01-01 00:00:00 +0000
@@ -0,0 +1,2 @@
+Old revision: prismakov@xxxxxxxxx-20140531193649-up9bhmhcprm904wv
+New revision: cory.johns@xxxxxxxxxxxxx-20140610152046-ckq6cgiu7dxo196a

Index: bundles.yaml
=== modified file 'bundles.yaml'
--- bundles.yaml	2014-05-30 14:42:03 +0000
+++ bundles.yaml	2014-06-10 15:20:46 +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
@@ -35,57 +35,52 @@
        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:
-    - [router, [cc, uaa, logrouter, dea, broker]]
-    - [nats, [cc, uaa, router, loggregator, logrouter, dea, broker]]
-    - [loggregator, [dea, logrouter]]
-    - [mysql, [cc, broker]]
+    - ['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]]

  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





-- 
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.