diff options
Diffstat (limited to 'ci/nosdn')
| -rw-r--r-- | ci/nosdn/juju-deployer/ovs-ha.yaml | 18 | ||||
| -rw-r--r-- | ci/nosdn/juju-deployer/ovs-tip.yaml | 5 | ||||
| -rw-r--r-- | ci/nosdn/juju-deployer/ovs.yaml | 7 |
3 files changed, 16 insertions, 14 deletions
diff --git a/ci/nosdn/juju-deployer/ovs-ha.yaml b/ci/nosdn/juju-deployer/ovs-ha.yaml index 686f17b0..5b5845c5 100644 --- a/ci/nosdn/juju-deployer/ovs-ha.yaml +++ b/ci/nosdn/juju-deployer/ovs-ha.yaml @@ -58,6 +58,7 @@ openstack-phase2: num_units: 1 options: use-embedded-webserver: true + operator-roles: "Memeber,admin" to: - "lxc:nodes-api=0" cinder: @@ -68,8 +69,8 @@ openstack-phase2: glance-api-version: 2 ha-mcastport: 5401 to: - - "lxc:nodes-api=0" - "lxc:nodes-api=1" + - "lxc:nodes-api=0" - "lxc:nodes-api=2" cinder-ceph: charm: cs:trusty/cinder-ceph @@ -81,9 +82,9 @@ openstack-phase2: ha-mcastport: 5402 vip: 10.4.1.12 to: + - "lxc:nodes-api=2" - "lxc:nodes-api=0" - "lxc:nodes-api=1" - - "lxc:nodes-api=2" keystone: charm: cs:trusty/keystone num_units: 3 @@ -111,8 +112,8 @@ openstack-phase2: sst-password: 127rc14t51 vip: 10.4.1.15 to: - - "lxc:nodes-api=0" - "lxc:nodes-api=1" + - "lxc:nodes-api=0" - "lxc:nodes-api=2" neutron-api: charm: cs:trusty/neutron-api @@ -121,9 +122,9 @@ openstack-phase2: neutron-security-groups: true vip: 10.4.1.17 to: + - "lxc:nodes-api=2" - "lxc:nodes-api=0" - "lxc:nodes-api=1" - - "lxc:nodes-api=2" neutron-gateway: charm: cs:trusty/neutron-gateway num_units: 1 @@ -169,16 +170,16 @@ openstack-phase2: webroot: / vip: 10.4.1.11 to: - - "lxc:nodes-api=0" - "lxc:nodes-api=1" + - "lxc:nodes-api=0" - "lxc:nodes-api=2" rabbitmq-server: charm: cs:trusty/rabbitmq-server num_units: 3 to: + - "lxc:nodes-api=2" - "lxc:nodes-api=0" - "lxc:nodes-api=1" - - "lxc:nodes-api=2" heat: charm: cs:trusty/heat to: @@ -325,6 +326,7 @@ trusty-liberty: series: trusty ceph-osd-replication-count: 2 admin-role: admin + keystone-admin-role: admin trusty-kilo-nodes: inherits: openstack-phase1 @@ -342,7 +344,7 @@ trusty-kilo: series: trusty ceph-osd-replication-count: 2 admin-role: admin - + keystone-admin-role: admin trusty-juno-nodes: inherits: openstack-phase1 @@ -360,5 +362,5 @@ trusty-juno: series: trusty ceph-osd-replication-count: 2 admin-role: admin - + keystone-admin-role: admin diff --git a/ci/nosdn/juju-deployer/ovs-tip.yaml b/ci/nosdn/juju-deployer/ovs-tip.yaml index f3bfbdf6..25001c19 100644 --- a/ci/nosdn/juju-deployer/ovs-tip.yaml +++ b/ci/nosdn/juju-deployer/ovs-tip.yaml @@ -252,7 +252,7 @@ trusty-liberty: series: trusty ceph-osd-replication-count: 1 admin-role: admin - + keystone-admin-role: admin trusty-kilo-nodes: inherits: openstack-phase1 @@ -272,6 +272,5 @@ trusty-kilo: series: trusty ceph-osd-replication-count: 1 admin-role: admin - - + keystone-admin-role: admin diff --git a/ci/nosdn/juju-deployer/ovs.yaml b/ci/nosdn/juju-deployer/ovs.yaml index ea0906ce..46659686 100644 --- a/ci/nosdn/juju-deployer/ovs.yaml +++ b/ci/nosdn/juju-deployer/ovs.yaml @@ -53,6 +53,7 @@ openstack-phase2: num_units: 1 options: use-embedded-webserver: true + operator-roles: "Memeber,admin" to: - "lxc:nodes-api=0" cinder: @@ -259,7 +260,7 @@ trusty-liberty: series: trusty ceph-osd-replication-count: 1 admin-role: admin - + keystone-admin-role: admin trusty-kilo-nodes: inherits: openstack-phase1 @@ -277,7 +278,7 @@ trusty-kilo: series: trusty ceph-osd-replication-count: 1 admin-role: admin - + keystone-admin-role: admin trusty-juno-nodes: inherits: openstack-phase1 @@ -295,5 +296,5 @@ trusty-juno: series: trusty ceph-osd-replication-count: 1 admin-role: admin - + keystone-admin-role: admin |