summaryrefslogtreecommitdiffstats
path: root/ci/onos/juju-deployer
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 19:26:18 +0000
commit48611068190d979944f96d653ae06d519ee079f8 (patch)
tree44c29f5c4964fef5ffeb0f7dfa514ab5fee04063 /ci/onos/juju-deployer
parent796db0fbdb49c499464720cf11587de7e184120b (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 (cherry picked from commit 5ac42a507a7596825aacd4d9baab25e502e61116)
Diffstat (limited to 'ci/onos/juju-deployer')
-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
3 files changed, 16 insertions, 3 deletions
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
+