diff options
| author |   Narinder Gupta <narinder.gupta@canonical.com> | 2016-01-26 14:06:01 -0600 |
|---|---|---|
| committer | Narinder Gupta <narinder.gupta@canonical.com> | 2016-01-26 20:08:59 +0000 |
| commit | 4cc6cd00d58611154d5d98b4ba86a4d36844507c (patch) | |
| tree | bd13e4cfcf18cce318c9c38e2fc67b4734a63c9c /ci/odl/juju-deployer | |
| parent | bee790b3b2ef7c1af626e79373b277272dc23d73 (diff) | |
mofidied the bundles to use the latest charms from next branch.
Change-Id: I887bf5d62899fb4efcfc7ec19376f8722f6e1528
(cherry picked from commit 1596207a399591aacfa8ac03a1718cb56b0ad5bb)
Diffstat (limited to 'ci/odl/juju-deployer')
| -rw-r--r-- | ci/odl/juju-deployer/ovs-odl-nonha.yaml | 6 | ||||
| -rw-r--r-- | ci/odl/juju-deployer/ovs-odl-tip.yaml | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/ci/odl/juju-deployer/ovs-odl-nonha.yaml b/ci/odl/juju-deployer/ovs-odl-nonha.yaml index d4c398de..9a47982c 100644 --- a/ci/odl/juju-deployer/ovs-odl-nonha.yaml +++ b/ci/odl/juju-deployer/ovs-odl-nonha.yaml @@ -58,7 +58,7 @@ openstack-phase2: to: - "lxc:nodes-api=0" ceph-osd: - charm: cs:trusty/ceph-osd + branch: "lp:~openstack-charmers/charms/trusty/ceph-osd/next" num_units: 1 options: osd-devices: /srv @@ -66,7 +66,7 @@ openstack-phase2: to: - "nodes-compute=0" ceph-radosgw: - charm: cs:trusty/ceph-radosgw + branch: "lp:~openstack-charmers/charms/trusty/ceph-radosgw/next" num_units: 1 options: use-embedded-webserver: true @@ -163,7 +163,7 @@ openstack-phase2: to: - "lxc:nodes-api=0" neutron-api-odl: - branch: lp:~openstack-charmers/charms/trusty/neutron-api-odl/vpp + branch: lp:~openstack-charmers/charms/trusty/neutron-api-odl/next options: overlay-network-type: 'vxlan gre' security-groups: True diff --git a/ci/odl/juju-deployer/ovs-odl-tip.yaml b/ci/odl/juju-deployer/ovs-odl-tip.yaml index 2d83b60d..68b5f5ed 100644 --- a/ci/odl/juju-deployer/ovs-odl-tip.yaml +++ b/ci/odl/juju-deployer/ovs-odl-tip.yaml @@ -58,7 +58,7 @@ openstack-phase2: to: - "lxc:nodes-api=0" ceph-osd: - charm: cs:trusty/ceph-osd + branch: "lp:~openstack-charmers/charms/trusty/ceph-osd/next" num_units: 1 options: osd-devices: /srv @@ -66,7 +66,7 @@ openstack-phase2: to: - "nodes-compute=0" ceph-radosgw: - charm: cs:trusty/ceph-radosgw + branch: "lp:~openstack-charmers/charms/trusty/ceph-radosgw/next" num_units: 1 options: use-embedded-webserver: true @@ -166,7 +166,7 @@ openstack-phase2: to: - "lxc:nodes-api=0" neutron-api-odl: - branch: lp:~openstack-charmers/charms/trusty/neutron-api-odl/vpp + branch: lp:~openstack-charmers/charms/trusty/neutron-api-odl/next options: overlay-network-type: 'vxlan gre' security-groups: True |