diff options
| author |   Narinder Gupta <narinder.gupta@canonical.com> | 2016-01-11 18:06:18 -0600 |
|---|---|---|
| committer | Narinder Gupta <narinder.gupta@canonical.com> | 2016-01-12 05:47:17 +0000 |
| commit | 6434a0cec7309d16ca220c19a395a92caf143ac7 (patch) | |
| tree | 283af3c360bad408ca35f1e33f67dffad87c7200 /ci/opencontrail/juju-deployer | |
| parent | 07b35e22299c8e0cd5c39340b05420a1109b6268 (diff) | |
ymodified to include the changes needed for MAAS 1.9
Change-Id: Ia7638dda099342bb65b89cddb90813a66aa53d08
(cherry picked from commit f27f64a537b51c35979cef258e933fad5330fc52)
Diffstat (limited to 'ci/opencontrail/juju-deployer')
| -rw-r--r-- | ci/opencontrail/juju-deployer/contrail-ha.yaml | 4 | ||||
| -rw-r--r-- | ci/opencontrail/juju-deployer/contrail-tip.yaml | 4 | ||||
| -rw-r--r-- | ci/opencontrail/juju-deployer/contrail.yaml | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/ci/opencontrail/juju-deployer/contrail-ha.yaml b/ci/opencontrail/juju-deployer/contrail-ha.yaml index 907fe928..1c70e73d 100644 --- a/ci/opencontrail/juju-deployer/contrail-ha.yaml +++ b/ci/opencontrail/juju-deployer/contrail-ha.yaml @@ -3,11 +3,11 @@ openstack-phase1: series: trusty services: nodes-api: - charm: "local:trusty/ubuntu-nodes-controller" + charm: "cs:trusty/ubuntu" num_units: 3 constraints: tags=control nodes-compute: - charm: "local:trusty/ubuntu-nodes-compute" + charm: "cs:trusty/ubuntu" num_units: 2 constraints: tags=compute "ntp": diff --git a/ci/opencontrail/juju-deployer/contrail-tip.yaml b/ci/opencontrail/juju-deployer/contrail-tip.yaml index da32c8fa..ca7ad4ae 100644 --- a/ci/opencontrail/juju-deployer/contrail-tip.yaml +++ b/ci/opencontrail/juju-deployer/contrail-tip.yaml @@ -3,11 +3,11 @@ openstack-phase1: series: trusty services: nodes-api: - charm: "local:trusty/ubuntu-nodes-controller" + charm: "cs:trusty/ubuntu" num_units: 1 constraints: tags=control nodes-compute: - charm: "local:trusty/ubuntu-nodes-compute" + charm: "cs:trusty/ubuntu" num_units: 1 constraints: tags=compute "ntp": diff --git a/ci/opencontrail/juju-deployer/contrail.yaml b/ci/opencontrail/juju-deployer/contrail.yaml index ec58c058..f01d68eb 100644 --- a/ci/opencontrail/juju-deployer/contrail.yaml +++ b/ci/opencontrail/juju-deployer/contrail.yaml @@ -3,11 +3,11 @@ openstack-phase1: series: trusty services: nodes-api: - charm: "local:trusty/ubuntu-nodes-controller" + charm: "cs:trusty/ubuntu" num_units: 1 constraints: tags=control nodes-compute: - charm: "local:trusty/ubuntu-nodes-compute" + charm: "cs:trusty/ubuntu" num_units: 1 constraints: tags=compute "ntp": |