From 13e03ebcfee0b434716543fb3a01eb7eb1e59015 Mon Sep 17 00:00:00 2001 From: Narinder Gupta Date: Mon, 11 Jan 2016 20:46:57 -0600 Subject: 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 --- ci/odl/juju-deployer/ovs-odl-ha.yaml | 5 ++--- ci/odl/juju-deployer/ovs-odl-tip.yaml | 1 + ci/odl/juju-deployer/ovs-odl.yaml | 1 + 3 files changed, 4 insertions(+), 3 deletions(-) (limited to 'ci/odl') 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": -- cgit 1.2.3-korg