summaryrefslogtreecommitdiffstats
path: root/ci/opencontrail/juju-deployer
diff options
context:
space:
mode:
authorNarinder Gupta <narinder.gupta@canonical.com>2015-10-06 22:04:44 -0500
committerNarinder Gupta <narinder.gupta@canonical.com>2015-10-06 22:04:44 -0500
commit4e6b5c1045fb67a02f5f61f5e270aae39bdd7a86 (patch)
treecd8059af0515d42ac4948a2543d4f322085f8be2 /ci/opencontrail/juju-deployer
parentb0183f379497d9dd5c6ee9792f58b3b8290daa71 (diff)
modified to match the taging with bundle.
Change-Id: Ib8671cdf4c041f33306e12fae5144ef85daa3556
Diffstat (limited to 'ci/opencontrail/juju-deployer')
-rw-r--r--ci/opencontrail/juju-deployer/contrail.yaml18
1 files changed, 10 insertions, 8 deletions
diff --git a/ci/opencontrail/juju-deployer/contrail.yaml b/ci/opencontrail/juju-deployer/contrail.yaml
index c2f48789..68cda3e2 100644
--- a/ci/opencontrail/juju-deployer/contrail.yaml
+++ b/ci/opencontrail/juju-deployer/contrail.yaml
@@ -2,9 +2,12 @@ openstack:
services:
ubuntu:
branch: "lp:charms/trusty/ubuntu"
- constraints: tags=physical
- num_units: 2
-
+ constraints: tags=control
+ num_units: 1
+ ubuntu-compute:
+ branch: "lp:charms/trusty/ubuntu"
+ constraints: tags=compute
+ num_units: 1
mysql:
constraints: mem=1G
options:
@@ -35,11 +38,10 @@ openstack:
nova-compute:
branch: lp:~openstack-charmers/charms/trusty/nova-compute/next
- constraints: tags=physical
- num_units: 2
+ constraints: tags=compute
+ num_units: 1
to:
- - "ubuntu=0"
- - "ubuntu=1"
+ - "ubuntu-compute=0"
options:
manage-neutron-plugin-legacy-mode: false
nova-cloud-controller:
@@ -94,7 +96,7 @@ contrail:
cassandra:
branch: lp:~sdn-charmers/charms/precise/cassandra/forced-install
series: precise
- constraints: tags=physical
+ constraints: tags=control
options:
allow-single-node: true