summaryrefslogtreecommitdiffstats
path: root/ci
diff options
context:
space:
mode:
authorNarinder Gupta <narinder.gupta@canonical.com>2016-01-12 13:21:39 -0600
committerNarinder Gupta <narinder.gupta@canonical.com>2016-01-12 13:24:06 -0600
commit5ac42a507a7596825aacd4d9baab25e502e61116 (patch)
tree43026e39c7967fbd26c134cb772658efd22b6e7d /ci
parentefe44c2a1f492eaac6958244fdca7cd49cf10d43 (diff)
modified admin-role: admin for all charms as there was an issue
where deployment failed if we add this option only to keystone charm. Change-Id: I8a50b201f897445cf606beed6068c6f7bae62787
Diffstat (limited to 'ci')
-rw-r--r--ci/nosdn/juju-deployer/ovs-ha.yaml6
-rw-r--r--ci/nosdn/juju-deployer/ovs-tip.yaml5
-rw-r--r--ci/nosdn/juju-deployer/ovs.yaml7
-rw-r--r--ci/odl/juju-deployer/ovs-odl-ha.yaml4
-rw-r--r--ci/odl/juju-deployer/ovs-odl-tip.yaml4
-rw-r--r--ci/odl/juju-deployer/ovs-odl.yaml7
-rw-r--r--ci/onos/juju-deployer/onos-ha.yaml7
-rw-r--r--ci/onos/juju-deployer/onos-tip.yaml5
-rw-r--r--ci/onos/juju-deployer/onos.yaml7
-rw-r--r--ci/opencontrail/juju-deployer/contrail-ha.yaml7
-rw-r--r--ci/opencontrail/juju-deployer/contrail-tip.yaml7
-rw-r--r--ci/opencontrail/juju-deployer/contrail.yaml4
12 files changed, 56 insertions, 14 deletions
diff --git a/ci/nosdn/juju-deployer/ovs-ha.yaml b/ci/nosdn/juju-deployer/ovs-ha.yaml
index 74682e76..686f17b0 100644
--- a/ci/nosdn/juju-deployer/ovs-ha.yaml
+++ b/ci/nosdn/juju-deployer/ovs-ha.yaml
@@ -90,7 +90,6 @@ openstack-phase2:
options:
admin-password: openstack
admin-token: admin
- admin-role: admin
ha-mcastport: 5403
vip: 10.4.1.13
to:
@@ -325,6 +324,7 @@ trusty-liberty:
"openstack-origin": "cloud:trusty-liberty"
series: trusty
ceph-osd-replication-count: 2
+ admin-role: admin
trusty-kilo-nodes:
inherits: openstack-phase1
@@ -341,6 +341,8 @@ trusty-kilo:
"openstack-origin": "cloud:trusty-kilo"
series: trusty
ceph-osd-replication-count: 2
+ admin-role: admin
+
trusty-juno-nodes:
inherits: openstack-phase1
@@ -357,4 +359,6 @@ trusty-juno:
"openstack-origin": "cloud:trusty-juno"
series: trusty
ceph-osd-replication-count: 2
+ admin-role: admin
+
diff --git a/ci/nosdn/juju-deployer/ovs-tip.yaml b/ci/nosdn/juju-deployer/ovs-tip.yaml
index eae10815..f3bfbdf6 100644
--- a/ci/nosdn/juju-deployer/ovs-tip.yaml
+++ b/ci/nosdn/juju-deployer/ovs-tip.yaml
@@ -98,7 +98,6 @@ 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":
@@ -252,6 +251,8 @@ trusty-liberty:
"openstack-origin": "cloud:trusty-liberty"
series: trusty
ceph-osd-replication-count: 1
+ admin-role: admin
+
trusty-kilo-nodes:
inherits: openstack-phase1
@@ -270,5 +271,7 @@ trusty-kilo:
source: cloud:trusty-kilo
series: trusty
ceph-osd-replication-count: 1
+ admin-role: admin
+
diff --git a/ci/nosdn/juju-deployer/ovs.yaml b/ci/nosdn/juju-deployer/ovs.yaml
index 137321b0..ea0906ce 100644
--- a/ci/nosdn/juju-deployer/ovs.yaml
+++ b/ci/nosdn/juju-deployer/ovs.yaml
@@ -80,7 +80,6 @@ openstack-phase2:
options:
admin-password: openstack
admin-token: admin
- admin-role: admin
ha-mcastport: 5403
to:
- "lxc:nodes-api=0"
@@ -259,6 +258,8 @@ trusty-liberty:
"openstack-origin": "cloud:trusty-liberty"
series: trusty
ceph-osd-replication-count: 1
+ admin-role: admin
+
trusty-kilo-nodes:
inherits: openstack-phase1
@@ -275,6 +276,8 @@ trusty-kilo:
"openstack-origin": "cloud:trusty-kilo"
series: trusty
ceph-osd-replication-count: 1
+ admin-role: admin
+
trusty-juno-nodes:
inherits: openstack-phase1
@@ -291,4 +294,6 @@ trusty-juno:
"openstack-origin": "cloud:trusty-juno"
series: trusty
ceph-osd-replication-count: 1
+ admin-role: admin
+
diff --git a/ci/odl/juju-deployer/ovs-odl-ha.yaml b/ci/odl/juju-deployer/ovs-odl-ha.yaml
index 633c8705..205c91df 100644
--- a/ci/odl/juju-deployer/ovs-odl-ha.yaml
+++ b/ci/odl/juju-deployer/ovs-odl-ha.yaml
@@ -142,7 +142,6 @@ openstack-phase2:
# ha-mcastport: 5402
"admin-password": openstack
"admin-token": admin
- "admin-role": admin
vip: 10.4.1.13
to:
- "lxc:nodes-api=0"
@@ -350,6 +349,7 @@ trusty-liberty:
"openstack-origin": "cloud:trusty-liberty"
series: trusty
ceph-osd-replication-count: 2
+ admin-role: admin
trusty-kilo-nodes:
inherits: openstack-phase1
@@ -367,6 +367,7 @@ trusty-kilo:
"openstack-origin": "cloud:trusty-kilo"
series: trusty
ceph-osd-replication-count: 2
+ admin-role: admin
trusty-juno-nodes:
@@ -385,5 +386,6 @@ trusty-juno:
"openstack-origin": "cloud:trusty-juno"
series: trusty
ceph-osd-replication-count: 2
+ admin-role: admin
diff --git a/ci/odl/juju-deployer/ovs-odl-tip.yaml b/ci/odl/juju-deployer/ovs-odl-tip.yaml
index ac24385b..17726291 100644
--- a/ci/odl/juju-deployer/ovs-odl-tip.yaml
+++ b/ci/odl/juju-deployer/ovs-odl-tip.yaml
@@ -98,7 +98,6 @@ 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":
@@ -269,6 +268,7 @@ trusty-liberty:
"openstack-origin": "cloud:trusty-liberty"
series: trusty
ceph-osd-replication-count: 1
+ admin-role: admin
trusty-kilo-nodes:
inherits: openstack-phase1
@@ -287,5 +287,5 @@ trusty-kilo:
source: cloud:trusty-kilo
series: trusty
ceph-osd-replication-count: 1
-
+ admin-role: admin
diff --git a/ci/odl/juju-deployer/ovs-odl.yaml b/ci/odl/juju-deployer/ovs-odl.yaml
index b120f416..c122f763 100644
--- a/ci/odl/juju-deployer/ovs-odl.yaml
+++ b/ci/odl/juju-deployer/ovs-odl.yaml
@@ -96,7 +96,6 @@ openstack-phase2:
# ha-mcastport: 5402
"admin-password": openstack
"admin-token": admin
- "admin-role": admin
to:
- "lxc:nodes-api=0"
"openstack-dashboard":
@@ -266,6 +265,8 @@ trusty-liberty:
"openstack-origin": "cloud:trusty-liberty"
series: trusty
ceph-osd-replication-count: 1
+ admin-role: admin
+
trusty-kilo-nodes:
inherits: openstack-phase1
@@ -282,6 +283,8 @@ trusty-kilo:
"openstack-origin": "cloud:trusty-kilo"
series: trusty
ceph-osd-replication-count: 1
+ admin-role: admin
+
trusty-juno-nodes:
@@ -299,5 +302,7 @@ trusty-juno:
"openstack-origin": "cloud:trusty-juno"
series: trusty
ceph-osd-replication-count: 1
+ admin-role: admin
+
diff --git a/ci/onos/juju-deployer/onos-ha.yaml b/ci/onos/juju-deployer/onos-ha.yaml
index a1b26887..a07ccc3c 100644
--- a/ci/onos/juju-deployer/onos-ha.yaml
+++ b/ci/onos/juju-deployer/onos-ha.yaml
@@ -143,7 +143,6 @@ openstack-phase2:
# ha-mcastport: 5402
"admin-password": openstack
"admin-token": admin
- "admin-role": admin
vip: 10.4.1.13
to:
- "lxc:nodes-api=0"
@@ -345,6 +344,8 @@ trusty-liberty:
"openstack-origin": "cloud:trusty-liberty"
series: trusty
ceph-osd-replication-count: 2
+ admin-role: admin
+
trusty-kilo-nodes:
inherits: openstack-phase1
@@ -362,6 +363,8 @@ trusty-kilo:
"openstack-origin": "cloud:trusty-kilo"
series: trusty
ceph-osd-replication-count: 2
+ admin-role: admin
+
trusty-juno-nodes:
@@ -380,5 +383,7 @@ trusty-juno:
"openstack-origin": "cloud:trusty-juno"
series: trusty
ceph-osd-replication-count: 2
+ admin-role: admin
+
diff --git a/ci/onos/juju-deployer/onos-tip.yaml b/ci/onos/juju-deployer/onos-tip.yaml
index 049ca08e..bcfeeef1 100644
--- a/ci/onos/juju-deployer/onos-tip.yaml
+++ b/ci/onos/juju-deployer/onos-tip.yaml
@@ -98,7 +98,6 @@ 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":
@@ -262,6 +261,8 @@ trusty-liberty:
"openstack-origin": "cloud:trusty-liberty"
series: trusty
ceph-osd-replication-count: 1
+ admin-role: admin
+
trusty-kilo-nodes:
inherits: openstack-phase1
@@ -280,5 +281,7 @@ trusty-kilo:
source: cloud:trusty-kilo
series: trusty
ceph-osd-replication-count: 1
+ admin-role: admin
+
diff --git a/ci/onos/juju-deployer/onos.yaml b/ci/onos/juju-deployer/onos.yaml
index 44638d2f..506b516e 100644
--- a/ci/onos/juju-deployer/onos.yaml
+++ b/ci/onos/juju-deployer/onos.yaml
@@ -96,7 +96,6 @@ openstack-phase2:
# ha-mcastport: 5402
"admin-password": openstack
"admin-token": admin
- "admin-role": admin
to:
- "lxc:nodes-api=0"
"openstack-dashboard":
@@ -260,6 +259,8 @@ trusty-liberty:
"openstack-origin": "cloud:trusty-liberty"
series: trusty
ceph-osd-replication-count: 1
+ admin-role: admin
+
trusty-kilo-nodes:
inherits: openstack-phase1
@@ -276,6 +277,8 @@ trusty-kilo:
"openstack-origin": "cloud:trusty-kilo"
series: trusty
ceph-osd-replication-count: 1
+ admin-role: admin
+
trusty-juno-nodes:
@@ -293,5 +296,7 @@ trusty-juno:
"openstack-origin": "cloud:trusty-juno"
series: trusty
ceph-osd-replication-count: 1
+ admin-role: admin
+
diff --git a/ci/opencontrail/juju-deployer/contrail-ha.yaml b/ci/opencontrail/juju-deployer/contrail-ha.yaml
index c3c57737..6cc86bf6 100644
--- a/ci/opencontrail/juju-deployer/contrail-ha.yaml
+++ b/ci/opencontrail/juju-deployer/contrail-ha.yaml
@@ -159,7 +159,6 @@ openstack-phase2:
options:
"admin-password": openstack
"admin-token": admin
- "admin-role": admin
vip: 10.4.1.13
to:
- "lxc:nodes-api=0"
@@ -356,6 +355,8 @@ trusty-liberty:
openstack-origin: cloud:trusty-liberty
source: "cloud:trusty-liberty"
ceph-osd-replication-count: 2
+ admin-role: admin
+
trusty-kilo-nodes:
inherits: openstack-phase1
@@ -374,6 +375,8 @@ trusty-kilo:
openstack-origin: cloud:trusty-kilo
source: "cloud:trusty-kilo"
ceph-osd-replication-count: 2
+ admin-role: admin
+
trusty-juno-nodes:
inherits: openstack-phase1
@@ -391,5 +394,7 @@ trusty-juno:
openstack-origin: cloud:trusty-juno
source: "cloud:trusty-juno"
ceph-osd-replication-count: 2
+ admin-role: admin
+
diff --git a/ci/opencontrail/juju-deployer/contrail-tip.yaml b/ci/opencontrail/juju-deployer/contrail-tip.yaml
index 59379d0e..0fa8f697 100644
--- a/ci/opencontrail/juju-deployer/contrail-tip.yaml
+++ b/ci/opencontrail/juju-deployer/contrail-tip.yaml
@@ -107,7 +107,6 @@ 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":
@@ -253,6 +252,8 @@ trusty-liberty:
openstack-origin: cloud:trusty-liberty
source: "cloud:trusty-liberty"
ceph-osd-replication-count: 1
+ admin-role: admin
+
trusty-kilo-nodes:
inherits: openstack-phase1
@@ -276,6 +277,8 @@ trusty-kilo:
openstack-origin: cloud:trusty-kilo
source: "cloud:trusty-kilo"
ceph-osd-replication-count: 1
+ admin-role: admin
+
trusty-juno-nodes:
@@ -299,5 +302,5 @@ trusty-juno:
openstack-origin: cloud:trusty-juno
source: "cloud:trusty-juno"
ceph-osd-replication-count: 1
-
+ admin-role: admin
diff --git a/ci/opencontrail/juju-deployer/contrail.yaml b/ci/opencontrail/juju-deployer/contrail.yaml
index fa9647bc..b47580eb 100644
--- a/ci/opencontrail/juju-deployer/contrail.yaml
+++ b/ci/opencontrail/juju-deployer/contrail.yaml
@@ -106,7 +106,6 @@ openstack-phase2:
options:
"admin-password": openstack
"admin-token": admin
- "admin-role": admin
to:
- "lxc:nodes-api=0"
"openstack-dashboard":
@@ -247,6 +246,7 @@ trusty-liberty:
openstack-origin: cloud:trusty-liberty
source: "cloud:trusty-liberty"
ceph-osd-replication-count: 1
+ admin-role: admin
trusty-kilo-nodes:
inherits: openstack-phase1
@@ -270,6 +270,7 @@ trusty-kilo:
openstack-origin: cloud:trusty-kilo
source: "cloud:trusty-kilo"
ceph-osd-replication-count: 1
+ admin-role: admin
trusty-juno-nodes:
@@ -293,5 +294,6 @@ trusty-juno:
openstack-origin: cloud:trusty-juno
source: "cloud:trusty-juno"
ceph-osd-replication-count: 1
+ admin-role: admin