summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ci/nosdn/juju-deployer/ovs-ha.yaml1
-rw-r--r--ci/nosdn/juju-deployer/ovs-tip.yaml1
-rw-r--r--ci/nosdn/juju-deployer/ovs.yaml1
-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
-rw-r--r--ci/onos/juju-deployer/onos-ha.yaml5
-rw-r--r--ci/onos/juju-deployer/onos-tip.yaml1
-rw-r--r--ci/onos/juju-deployer/onos.yaml1
-rw-r--r--ci/opencontrail/juju-deployer/contrail-ha.yaml5
-rw-r--r--ci/opencontrail/juju-deployer/contrail-tip.yaml1
-rw-r--r--ci/opencontrail/juju-deployer/contrail.yaml1
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 917cfc3c..32896ad3 100644
--- a/ci/nosdn/juju-deployer/ovs-ha.yaml
+++ b/ci/nosdn/juju-deployer/ovs-ha.yaml
@@ -92,6 +92,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 b78128c5..6d08a4d9 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 4f305695..b959b007 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 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":
diff --git a/ci/onos/juju-deployer/onos-ha.yaml b/ci/onos/juju-deployer/onos-ha.yaml
index 608c693b..5c83b84a 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 cfef5a8f..1b00752c 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 7bfbc9be..46ca358d 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 907fe928..f5afe1e3 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 da32c8fa..6b1dd0ad 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 ec58c058..88408bd4 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":