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/opencontrail/juju-deployer/contrail-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/opencontrail/juju-deployer/contrail-ha.yaml')
| -rw-r--r-- | ci/opencontrail/juju-deployer/contrail-ha.yaml | 7 |
1 files changed, 6 insertions, 1 deletions
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 + |