Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code | Sign in
(196)

Unified Diff: bundles.yaml

Issue 106920044: Port conflict resolutions & HM9000
Patch Set: Port conflict resolutions & HM9000 Created 9 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Please Sign in to add in-line comments.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « [revision details] ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: bundles.yaml
=== modified file 'bundles.yaml'
--- bundles.yaml 2014-06-05 09:28:57 +0000
+++ bundles.yaml 2014-06-12 18:55:24 +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,15 +34,21 @@
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]]
local:
inherits: base
@@ -54,43 +60,22 @@
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
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
loggregator:
- charm: cf-loggregator
- branch: lp:~cf-charmers/charms/trusty/cf-loggregator/trunk
- constraints: "arch=amd64"
- to: 0
-
+ to: 0
+ etcd:
+ to: 0
+ hm:
+ to: 0
« no previous file with comments | « [revision details] ('k') | no next file » | no next file with comments »

Powered by Google App Engine
RSS Feeds Recent Issues | This issue
This is Rietveld f62528b