diff options
Diffstat (limited to 'ci/odl')
| -rw-r--r-- | ci/odl/juju-deployer/ovs-odl-ha.yaml | 18 | ||||
| -rw-r--r-- | ci/odl/juju-deployer/ovs-odl-tip.yaml | 2 | ||||
| -rw-r--r-- | ci/odl/juju-deployer/ovs-odl.yaml | 8 |
3 files changed, 14 insertions, 14 deletions
diff --git a/ci/odl/juju-deployer/ovs-odl-ha.yaml b/ci/odl/juju-deployer/ovs-odl-ha.yaml index f1ed04b4..8800d8a0 100644 --- a/ci/odl/juju-deployer/ovs-odl-ha.yaml +++ b/ci/odl/juju-deployer/ovs-odl-ha.yaml @@ -31,8 +31,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" "hacluster-keystone": charm: "cs:trusty/hacluster" @@ -70,9 +70,9 @@ openstack-phase2: options: vip: 10.4.1.14 to: + - "lxc:nodes-api=2" - "lxc:nodes-api=0" - "lxc:nodes-api=1" - - "lxc:nodes-api=2" "ceilometer-agent": branch: "lp:~openstack-charmers/charms/trusty/ceilometer-agent/next" "mongodb": @@ -124,8 +124,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 @@ -133,9 +133,9 @@ openstack-phase2: branch: lp:charms/trusty/rabbitmq-server num_units: 3 to: + - "lxc:nodes-api=2" - "lxc:nodes-api=0" - "lxc:nodes-api=1" - - "lxc:nodes-api=2" "keystone": branch: lp:charms/trusty/keystone num_units: 3 @@ -156,8 +156,8 @@ openstack-phase2: vip: 10.4.1.11 webroot: / to: - - "lxc:nodes-api=0" - "lxc:nodes-api=1" + - "lxc:nodes-api=0" - "lxc:nodes-api=2" "nova-compute": branch: lp:~openstack-charmers/charms/trusty/nova-compute/next @@ -181,9 +181,9 @@ openstack-phase2: "service-guard": true vip: 10.4.1.16 to: + - "lxc:nodes-api=2" - "lxc:nodes-api=0" - "lxc:nodes-api=1" - - "lxc:nodes-api=2" "neutron-api": branch: lp:~openstack-charmers/charms/trusty/neutron-api/next num_units: 3 @@ -220,8 +220,8 @@ openstack-phase2: vip: 10.4.1.12 # ha-mcastport: 5402 to: - - "lxc:nodes-api=0" - "lxc:nodes-api=1" + - "lxc:nodes-api=0" - "lxc:nodes-api=2" neutron-api-odl: branch: lp:~openstack-charmers/charms/trusty/neutron-api-odl/vpp @@ -370,7 +370,7 @@ trusty-kilo: series: trusty ceph-osd-replication-count: 2 admin-role: admin - + keystone-admin-role: admin trusty-juno-nodes: inherits: openstack-phase1 @@ -389,5 +389,5 @@ trusty-juno: series: trusty ceph-osd-replication-count: 2 admin-role: admin - + keystone-admin-role: admin diff --git a/ci/odl/juju-deployer/ovs-odl-tip.yaml b/ci/odl/juju-deployer/ovs-odl-tip.yaml index 17726291..f79fb4ce 100644 --- a/ci/odl/juju-deployer/ovs-odl-tip.yaml +++ b/ci/odl/juju-deployer/ovs-odl-tip.yaml @@ -269,6 +269,7 @@ trusty-liberty: series: trusty ceph-osd-replication-count: 1 admin-role: admin + keystone-admin-role: admin trusty-kilo-nodes: inherits: openstack-phase1 @@ -288,4 +289,5 @@ trusty-kilo: series: trusty ceph-osd-replication-count: 1 admin-role: admin + keystone-admin-role: admin diff --git a/ci/odl/juju-deployer/ovs-odl.yaml b/ci/odl/juju-deployer/ovs-odl.yaml index c122f763..f478cec9 100644 --- a/ci/odl/juju-deployer/ovs-odl.yaml +++ b/ci/odl/juju-deployer/ovs-odl.yaml @@ -266,7 +266,7 @@ trusty-liberty: series: trusty ceph-osd-replication-count: 1 admin-role: admin - + keystone-admin-role: admin trusty-kilo-nodes: inherits: openstack-phase1 @@ -284,8 +284,7 @@ trusty-kilo: series: trusty ceph-osd-replication-count: 1 admin-role: admin - - + keystone-admin-role: admin trusty-juno-nodes: inherits: openstack-phase1 @@ -303,6 +302,5 @@ trusty-juno: series: trusty ceph-osd-replication-count: 1 admin-role: admin - - + keystone-admin-role: admin |