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