diff options
author | Narinder Gupta <narinder.gupta@canonical.com> | 2016-01-12 13:21:39 -0600 |
---|---|---|
committer | Narinder Gupta <narinder.gupta@canonical.com> | 2016-01-12 13:24:06 -0600 |
commit | 5ac42a507a7596825aacd4d9baab25e502e61116 (patch) | |
tree | 43026e39c7967fbd26c134cb772658efd22b6e7d /ci/odl/juju-deployer/ovs-odl-ha.yaml | |
parent | efe44c2a1f492eaac6958244fdca7cd49cf10d43 (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/odl/juju-deployer/ovs-odl-ha.yaml')
-rw-r--r-- | ci/odl/juju-deployer/ovs-odl-ha.yaml | 4 |
1 files changed, 3 insertions, 1 deletions
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 |