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 19:26:18 +0000 |
commit | 48611068190d979944f96d653ae06d519ee079f8 (patch) | |
tree | 44c29f5c4964fef5ffeb0f7dfa514ab5fee04063 /ci/onos/juju-deployer/onos-ha.yaml | |
parent | 796db0fbdb49c499464720cf11587de7e184120b (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/onos-ha.yaml')
-rw-r--r-- | ci/onos/juju-deployer/onos-ha.yaml | 7 |
1 files changed, 6 insertions, 1 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 + |