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/opencontrail/juju-deployer/contrail-tip.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/opencontrail/juju-deployer/contrail-tip.yaml')
| -rw-r--r-- | ci/opencontrail/juju-deployer/contrail-tip.yaml | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/ci/opencontrail/juju-deployer/contrail-tip.yaml b/ci/opencontrail/juju-deployer/contrail-tip.yaml index 59379d0e..0fa8f697 100644 --- a/ci/opencontrail/juju-deployer/contrail-tip.yaml +++ b/ci/opencontrail/juju-deployer/contrail-tip.yaml @@ -107,7 +107,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": @@ -253,6 +252,8 @@ trusty-liberty: openstack-origin: cloud:trusty-liberty source: "cloud:trusty-liberty" 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 source: "cloud:trusty-kilo" ceph-osd-replication-count: 1 + admin-role: admin + trusty-juno-nodes: @@ -299,5 +302,5 @@ trusty-juno: openstack-origin: cloud:trusty-juno source: "cloud:trusty-juno" ceph-osd-replication-count: 1 - + admin-role: admin |