diff options
| author |   Narinder Gupta <narinder.gupta@canonical.com> | 2016-01-12 05:50:40 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@172.30.200.206> | 2016-01-12 05:50:40 +0000 |
| commit | 06ecf10474d77fc2d415d1d7bcd5cdf32099ae52 (patch) | |
| tree | 6909f25c6061ad6e89064120c46dffa0c8605a64 /ci/nosdn/juju-deployer | |
| parent | 6434a0cec7309d16ca220c19a395a92caf143ac7 (diff) | |
| parent | c1aaa2cc1c163928f0f6fd7dbd1bd68b594fc698 (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/nosdn/juju-deployer')
| -rw-r--r-- | ci/nosdn/juju-deployer/ovs-ha.yaml | 1 | ||||
| -rw-r--r-- | ci/nosdn/juju-deployer/ovs-tip.yaml | 1 | ||||
| -rw-r--r-- | ci/nosdn/juju-deployer/ovs.yaml | 1 |
3 files changed, 3 insertions, 0 deletions
diff --git a/ci/nosdn/juju-deployer/ovs-ha.yaml b/ci/nosdn/juju-deployer/ovs-ha.yaml index cd0fc740..74682e76 100644 --- a/ci/nosdn/juju-deployer/ovs-ha.yaml +++ b/ci/nosdn/juju-deployer/ovs-ha.yaml @@ -90,6 +90,7 @@ openstack-phase2: options: admin-password: openstack admin-token: admin + admin-role: admin ha-mcastport: 5403 vip: 10.4.1.13 to: diff --git a/ci/nosdn/juju-deployer/ovs-tip.yaml b/ci/nosdn/juju-deployer/ovs-tip.yaml index e291a7a8..eae10815 100644 --- a/ci/nosdn/juju-deployer/ovs-tip.yaml +++ b/ci/nosdn/juju-deployer/ovs-tip.yaml @@ -98,6 +98,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": diff --git a/ci/nosdn/juju-deployer/ovs.yaml b/ci/nosdn/juju-deployer/ovs.yaml index 6d52a486..137321b0 100644 --- a/ci/nosdn/juju-deployer/ovs.yaml +++ b/ci/nosdn/juju-deployer/ovs.yaml @@ -80,6 +80,7 @@ openstack-phase2: options: admin-password: openstack admin-token: admin + admin-role: admin ha-mcastport: 5403 to: - "lxc:nodes-api=0" |