From 5ac42a507a7596825aacd4d9baab25e502e61116 Mon Sep 17 00:00:00 2001 From: Narinder Gupta Date: Tue, 12 Jan 2016 13:21:39 -0600 Subject: 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 --- ci/nosdn/juju-deployer/ovs-tip.yaml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'ci/nosdn/juju-deployer/ovs-tip.yaml') diff --git a/ci/nosdn/juju-deployer/ovs-tip.yaml b/ci/nosdn/juju-deployer/ovs-tip.yaml index eae10815..f3bfbdf6 100644 --- a/ci/nosdn/juju-deployer/ovs-tip.yaml +++ b/ci/nosdn/juju-deployer/ovs-tip.yaml @@ -98,7 +98,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": @@ -252,6 +251,8 @@ trusty-liberty: "openstack-origin": "cloud:trusty-liberty" series: trusty ceph-osd-replication-count: 1 + admin-role: admin + trusty-kilo-nodes: inherits: openstack-phase1 @@ -270,5 +271,7 @@ trusty-kilo: source: cloud:trusty-kilo series: trusty ceph-osd-replication-count: 1 + admin-role: admin + -- cgit 1.2.3-korg