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/nosdn/juju-deployer/ovs.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/nosdn/juju-deployer/ovs.yaml')
| -rw-r--r-- | ci/nosdn/juju-deployer/ovs.yaml | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/ci/nosdn/juju-deployer/ovs.yaml b/ci/nosdn/juju-deployer/ovs.yaml index 137321b0..ea0906ce 100644 --- a/ci/nosdn/juju-deployer/ovs.yaml +++ b/ci/nosdn/juju-deployer/ovs.yaml @@ -80,7 +80,6 @@ openstack-phase2: options: admin-password: openstack admin-token: admin - admin-role: admin ha-mcastport: 5403 to: - "lxc:nodes-api=0" @@ -259,6 +258,8 @@ trusty-liberty: "openstack-origin": "cloud:trusty-liberty" series: trusty ceph-osd-replication-count: 1 + admin-role: admin + trusty-kilo-nodes: inherits: openstack-phase1 @@ -275,6 +276,8 @@ trusty-kilo: "openstack-origin": "cloud:trusty-kilo" series: trusty ceph-osd-replication-count: 1 + admin-role: admin + trusty-juno-nodes: inherits: openstack-phase1 @@ -291,4 +294,6 @@ trusty-juno: "openstack-origin": "cloud:trusty-juno" series: trusty ceph-osd-replication-count: 1 + admin-role: admin + |