summaryrefslogtreecommitdiffstats
path: root/ci/opencontrail/juju-deployer/contrail-tip.yaml
diff options
context:
space:
mode:
authorNarinder Gupta <narinder.gupta@canonical.com>2016-01-12 05:50:40 +0000
committerGerrit Code Review <gerrit@172.30.200.206>2016-01-12 05:50:40 +0000
commit06ecf10474d77fc2d415d1d7bcd5cdf32099ae52 (patch)
tree6909f25c6061ad6e89064120c46dffa0c8605a64 /ci/opencontrail/juju-deployer/contrail-tip.yaml
parent6434a0cec7309d16ca220c19a395a92caf143ac7 (diff)
parentc1aaa2cc1c163928f0f6fd7dbd1bd68b594fc698 (diff)
Merge "modified on the lines of nosdn bundle tested. Only single gateway needed for ceph. Modified bundle to include the role as admin instead of Admin. As Admin create by default." into stable/brahmaputra
Diffstat (limited to 'ci/opencontrail/juju-deployer/contrail-tip.yaml')
-rw-r--r--ci/opencontrail/juju-deployer/contrail-tip.yaml1
1 files changed, 1 insertions, 0 deletions
diff --git a/ci/opencontrail/juju-deployer/contrail-tip.yaml b/ci/opencontrail/juju-deployer/contrail-tip.yaml
index ca7ad4ae..59379d0e 100644
--- a/ci/opencontrail/juju-deployer/contrail-tip.yaml
+++ b/ci/opencontrail/juju-deployer/contrail-tip.yaml
@@ -107,6 +107,7 @@ 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":