diff options
Diffstat (limited to 'ci/nosdn')
| -rw-r--r-- | ci/nosdn/juju-deployer/ovs-ha.yaml | 6 | ||||
| -rw-r--r-- | ci/nosdn/juju-deployer/ovs-tip.yaml | 5 | ||||
| -rw-r--r-- | ci/nosdn/juju-deployer/ovs.yaml | 7 |
3 files changed, 15 insertions, 3 deletions
diff --git a/ci/nosdn/juju-deployer/ovs-ha.yaml b/ci/nosdn/juju-deployer/ovs-ha.yaml index 74682e76..686f17b0 100644 --- a/ci/nosdn/juju-deployer/ovs-ha.yaml +++ b/ci/nosdn/juju-deployer/ovs-ha.yaml @@ -90,7 +90,6 @@ openstack-phase2: options: admin-password: openstack admin-token: admin - admin-role: admin ha-mcastport: 5403 vip: 10.4.1.13 to: @@ -325,6 +324,7 @@ trusty-liberty: "openstack-origin": "cloud:trusty-liberty" series: trusty ceph-osd-replication-count: 2 + admin-role: admin trusty-kilo-nodes: inherits: openstack-phase1 @@ -341,6 +341,8 @@ trusty-kilo: "openstack-origin": "cloud:trusty-kilo" series: trusty ceph-osd-replication-count: 2 + admin-role: admin + trusty-juno-nodes: inherits: openstack-phase1 @@ -357,4 +359,6 @@ trusty-juno: "openstack-origin": "cloud:trusty-juno" series: trusty ceph-osd-replication-count: 2 + admin-role: admin + 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 + 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 + |