summaryrefslogtreecommitdiffstats
path: root/ci/odl
diff options
context:
space:
mode:
authorNarinder Gupta <narinder.gupta@canonical.com>2016-01-11 20:46:57 -0600
committerNarinder Gupta <narinder.gupta@canonical.com>2016-01-11 21:18:40 -0600
commit13e03ebcfee0b434716543fb3a01eb7eb1e59015 (patch)
treed0a3ff9095bea7d92581d3d8a17e87bf3172cfee /ci/odl
parentf27f64a537b51c35979cef258e933fad5330fc52 (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
Diffstat (limited to 'ci/odl')
-rw-r--r--ci/odl/juju-deployer/ovs-odl-ha.yaml5
-rw-r--r--ci/odl/juju-deployer/ovs-odl-tip.yaml1
-rw-r--r--ci/odl/juju-deployer/ovs-odl.yaml1
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 f16dd640..4b7b20af 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 9119896f..ac24385b 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 9f89d6f4..b120f416 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":