From 13e03ebcfee0b434716543fb3a01eb7eb1e59015 Mon Sep 17 00:00:00 2001
From: Narinder Gupta <narinder.gupta@canonical.com>
Date: Mon, 11 Jan 2016 20:46:57 -0600
Subject: [PATCH] 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/nosdn/juju-deployer/ovs-ha.yaml | 1 +
ci/nosdn/juju-deployer/ovs-tip.yaml | 1 +
ci/nosdn/juju-deployer/ovs.yaml | 1 +
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 +
ci/onos/juju-deployer/onos-ha.yaml | 5 ++---
ci/onos/juju-deployer/onos-tip.yaml | 1 +
ci/onos/juju-deployer/onos.yaml | 1 +
ci/opencontrail/juju-deployer/contrail-ha.yaml | 5 ++---
ci/opencontrail/juju-deployer/contrail-tip.yaml | 1 +
ci/opencontrail/juju-deployer/contrail.yaml | 1 +
12 files changed, 15 insertions(+), 9 deletions(-)
diff --git a/ci/nosdn/juju-deployer/ovs-ha.yaml b/ci/nosdn/juju-deployer/ovs-ha.yaml
index cd0fc740..74682e76 100644
--- a/ci/nosdn/juju-deployer/ovs-ha.yaml
+++ b/ci/nosdn/juju-deployer/ovs-ha.yaml
@@ -90,6 +90,7 @@ openstack-phase2:
options:
admin-password: openstack
admin-token: admin
+ admin-role: admin
ha-mcastport: 5403
vip: 10.4.1.13
to:
diff --git a/ci/nosdn/juju-deployer/ovs-tip.yaml b/ci/nosdn/juju-deployer/ovs-tip.yaml
index e291a7a8..eae10815 100644
--- a/ci/nosdn/juju-deployer/ovs-tip.yaml
+++ b/ci/nosdn/juju-deployer/ovs-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/nosdn/juju-deployer/ovs.yaml b/ci/nosdn/juju-deployer/ovs.yaml
index 6d52a486..137321b0 100644
--- a/ci/nosdn/juju-deployer/ovs.yaml
+++ b/ci/nosdn/juju-deployer/ovs.yaml
@@ -80,6 +80,7 @@ openstack-phase2:
options:
admin-password: openstack
admin-token: admin
+ admin-role: admin
ha-mcastport: 5403
to:
- "lxc:nodes-api=0"
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":
diff --git a/ci/onos/juju-deployer/onos-ha.yaml b/ci/onos/juju-deployer/onos-ha.yaml
index 9bacffce..a1b26887 100644
--- a/ci/onos/juju-deployer/onos-ha.yaml
+++ b/ci/onos/juju-deployer/onos-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
@@ -145,6 +143,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/onos/juju-deployer/onos-tip.yaml b/ci/onos/juju-deployer/onos-tip.yaml
index f8a7a6fa..049ca08e 100644
--- a/ci/onos/juju-deployer/onos-tip.yaml
+++ b/ci/onos/juju-deployer/onos-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/onos/juju-deployer/onos.yaml b/ci/onos/juju-deployer/onos.yaml
index 7d08182a..44638d2f 100644
--- a/ci/onos/juju-deployer/onos.yaml
+++ b/ci/onos/juju-deployer/onos.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":
diff --git a/ci/opencontrail/juju-deployer/contrail-ha.yaml b/ci/opencontrail/juju-deployer/contrail-ha.yaml
index 1c70e73d..c837eebf 100644
--- a/ci/opencontrail/juju-deployer/contrail-ha.yaml
+++ b/ci/opencontrail/juju-deployer/contrail-ha.yaml
@@ -117,14 +117,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
@@ -161,6 +159,7 @@ openstack-phase2:
options:
"admin-password": openstack
"admin-token": admin
+ "admin-role": admin
vip: 10.4.1.13
to:
- "lxc:nodes-api=0"
diff --git a/ci/opencontrail/juju-deployer/contrail-tip.yaml b/ci/opencontrail/juju-deployer/contrail-tip.yaml
index ca7ad4ae..59379d0e 100644
--- a/ci/opencontrail/juju-deployer/contrail-tip.yaml
+++ b/ci/opencontrail/juju-deployer/contrail-tip.yaml
@@ -107,6 +107,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/opencontrail/juju-deployer/contrail.yaml b/ci/opencontrail/juju-deployer/contrail.yaml
index f01d68eb..fa9647bc 100644
--- a/ci/opencontrail/juju-deployer/contrail.yaml
+++ b/ci/opencontrail/juju-deployer/contrail.yaml
@@ -106,6 +106,7 @@ openstack-phase2:
options:
"admin-password": openstack
"admin-token": admin
+ "admin-role": admin
to:
- "lxc:nodes-api=0"
"openstack-dashboard":
--
2.16.6