diff options
| author |   Narinder Gupta <narinder.gupta@canonical.com> | 2015-11-16 21:37:24 -0600 |
|---|---|---|
| committer | Narinder Gupta <narinder.gupta@canonical.com> | 2015-11-16 21:37:24 -0600 |
| commit | 642e52148ced6858a22c7810bf0124af4bf30a12 (patch) | |
| tree | f91ed01f336b1d5752603903c4759975cb1bf8ea /ci/opencontrail | |
| parent | ae62d64e874c425eb3136dc42a80d5cb41a3e7f3 (diff) | |
modified the HA bundle to reflect the correct services.
Author: Narinder Gupta <narinder.gupta@canonical.com>
Change-Id: I4667cb99d371cd6e81b3e29728059431e7046c2c
Diffstat (limited to 'ci/opencontrail')
| -rw-r--r-- | ci/opencontrail/juju-deployer/contrail-ha.yaml | 28 |
1 files changed, 7 insertions, 21 deletions
diff --git a/ci/opencontrail/juju-deployer/contrail-ha.yaml b/ci/opencontrail/juju-deployer/contrail-ha.yaml index 3da5a823..5cb99499 100644 --- a/ci/opencontrail/juju-deployer/contrail-ha.yaml +++ b/ci/opencontrail/juju-deployer/contrail-ha.yaml @@ -139,25 +139,25 @@ openstack-phase2: - [ "neutron-api:ha", "hacluster-neutron:ha" ] - [ "nova-cloud-controller:ha", "hacluster-nova:ha" ] - [ "openstack-dashboard:ha", "hacluster-horizon:ha" ] - - [ keystone, mysql ] - - [ nova-cloud-controller, mysql ] + - [ keystone, percona-cluster ] + - [ nova-cloud-controller, percona-cluster ] - [ nova-cloud-controller, rabbitmq-server ] - [ nova-cloud-controller, glance ] - [ nova-cloud-controller, keystone ] - [ nova-compute, nova-cloud-controller ] - - [ "nova-compute:shared-db", "mysql:shared-db" ] + - [ "nova-compute:shared-db", "percona-cluster:shared-db" ] - [ "nova-compute:amqp", "rabbitmq-server:amqp" ] - [ nova-compute, glance ] - - [ glance, mysql ] + - [ glance, percona-cluster ] - [ glance, keystone ] - [ openstack-dashboard, keystone ] - - [ neutron-api, mysql ] + - [ neutron-api, percona-cluster ] - [ neutron-api, rabbitmq-server ] - [ neutron-api, nova-cloud-controller ] - [ neutron-api, keystone ] - [ neutron-api, neutron-api-contrail ] contrail: - inherits: openstack + inherits: openstack-phase2 services: cassandra: branch: lp:~stub/charms/trusty/cassandra/noauthentication @@ -208,6 +208,7 @@ contrail: neutron-contrail: branch: lp:~sdn-charmers/charms/trusty/neutron-contrail/trunk haproxy: + charm: cs:trusty/haproxy num_units: 2 options: peering_mode: active-active @@ -254,11 +255,6 @@ trusty-liberty-nodes: trusty-liberty: inherits: contrail series: trusty - services: - mysql: - charm: cs:trusty/mysql - rabbitmq-server: - charm: cs:trusty/rabbitmq-server overrides: series: trusty #os-data-network: 10.4.8.0/21 @@ -274,11 +270,6 @@ trusty-kilo-nodes: trusty-kilo: inherits: contrail series: trusty - services: - mysql: - charm: cs:trusty/mysql - rabbitmq-server: - charm: cs:trusty/rabbitmq-server overrides: series: trusty #os-data-network: 10.4.8.0/21 @@ -293,11 +284,6 @@ trusty-juno-nodes: trusty-juno: inherits: contrail series: trusty - services: - mysql: - charm: cs:trusty/mysql - rabbitmq-server: - charm: cs:trusty/rabbitmq-server overrides: series: trusty #os-data-network: 10.4.8.0/21 |