diff options
| author |   Narinder Gupta <narinder.gupta@canonical.com> | 2016-01-11 20:46:57 -0600 |
|---|---|---|
| committer | Narinder Gupta <narinder.gupta@canonical.com> | 2016-01-12 05:47:42 +0000 |
| commit | c1aaa2cc1c163928f0f6fd7dbd1bd68b594fc698 (patch) | |
| tree | d80b68d020bbeaf941ba45c1124a81c92feccc6f /ci/odl/juju-deployer | |
| parent | 07b35e22299c8e0cd5c39340b05420a1109b6268 (diff) | |
modified on the lines of nosdn bundle tested. Only single gateway
needed for ceph. Modified bundle to include the role as admin
instead of Admin. As Admin create by default.
Change-Id: I14108f934c877f3ed67aca0e9527fc3b82b9266e
(cherry picked from commit 13e03ebcfee0b434716543fb3a01eb7eb1e59015)
Diffstat (limited to 'ci/odl/juju-deployer')
| -rw-r--r-- | ci/odl/juju-deployer/ovs-odl-ha.yaml | 5 | ||||
| -rw-r--r-- | ci/odl/juju-deployer/ovs-odl-tip.yaml | 1 | ||||
| -rw-r--r-- | ci/odl/juju-deployer/ovs-odl.yaml | 1 |
3 files changed, 4 insertions, 3 deletions
diff --git a/ci/odl/juju-deployer/ovs-odl-ha.yaml b/ci/odl/juju-deployer/ovs-odl-ha.yaml index 6a046e38..15b8aea1 100644 --- a/ci/odl/juju-deployer/ovs-odl-ha.yaml +++ b/ci/odl/juju-deployer/ovs-odl-ha.yaml @@ -100,14 +100,12 @@ openstack-phase2: - "nodes-compute=1" ceph-osd: charm: cs:trusty/ceph-osd - num_units: 3 + num_units: 1 options: osd-devices: /srv osd-reformat: 'yes' to: - "nodes-api=0" - - "nodes-api=1" - - "nodes-api=2" ceph-radosgw: charm: cs:trusty/ceph-radosgw num_units: 3 @@ -144,6 +142,7 @@ openstack-phase2: # ha-mcastport: 5402 "admin-password": openstack "admin-token": admin + "admin-role": admin vip: 10.4.1.13 to: - "lxc:nodes-api=0" diff --git a/ci/odl/juju-deployer/ovs-odl-tip.yaml b/ci/odl/juju-deployer/ovs-odl-tip.yaml index 2d9a24ed..1a540e1b 100644 --- a/ci/odl/juju-deployer/ovs-odl-tip.yaml +++ b/ci/odl/juju-deployer/ovs-odl-tip.yaml @@ -98,6 +98,7 @@ openstack-phase2: openstack-origin-git: include-file://keystone-master.yaml "admin-password": openstack "admin-token": admin + "admin-role": admin to: - "lxc:nodes-api=0" "openstack-dashboard": diff --git a/ci/odl/juju-deployer/ovs-odl.yaml b/ci/odl/juju-deployer/ovs-odl.yaml index 0e6d4192..6bb318c2 100644 --- a/ci/odl/juju-deployer/ovs-odl.yaml +++ b/ci/odl/juju-deployer/ovs-odl.yaml @@ -96,6 +96,7 @@ openstack-phase2: # ha-mcastport: 5402 "admin-password": openstack "admin-token": admin + "admin-role": admin to: - "lxc:nodes-api=0" "openstack-dashboard": |