summaryrefslogtreecommitdiffstats
path: root/ci/odl
diff options
context:
space:
mode:
Diffstat (limited to 'ci/odl')
-rw-r--r--ci/odl/juju-deployer/ovs-odl-nonha.yaml4
-rw-r--r--ci/odl/juju-deployer/ovs-odl-tip.yaml13
2 files changed, 9 insertions, 8 deletions
diff --git a/ci/odl/juju-deployer/ovs-odl-nonha.yaml b/ci/odl/juju-deployer/ovs-odl-nonha.yaml
index ee090b0d..30deb14e 100644
--- a/ci/odl/juju-deployer/ovs-odl-nonha.yaml
+++ b/ci/odl/juju-deployer/ovs-odl-nonha.yaml
@@ -110,7 +110,7 @@ openstack-phase2:
- "lxc:nodes-api=0"
nova-compute:
branch: lp:~openstack-charmers/charms/trusty/nova-compute/next
- num_units: 1
+ num_units: 2
options:
enable-live-migration: true
enable-resize: true
@@ -118,7 +118,7 @@ openstack-phase2:
migration-auth-type: ssh
to:
- "nodes-compute=0"
-# - "nodes-compute=1"
+ - "nodes-compute=1"
# - "nodes-api=0"
# - "nodes-api=1"
# - "nodes-api=2"
diff --git a/ci/odl/juju-deployer/ovs-odl-tip.yaml b/ci/odl/juju-deployer/ovs-odl-tip.yaml
index 79b10c14..37cb6c1c 100644
--- a/ci/odl/juju-deployer/ovs-odl-tip.yaml
+++ b/ci/odl/juju-deployer/ovs-odl-tip.yaml
@@ -8,7 +8,7 @@ openstack-phase1:
constraints: tags=control
nodes-compute:
charm: "cs:trusty/ubuntu"
- num_units: 1
+ num_units: 2
constraints: tags=compute
ntp:
charm: "cs:trusty/ntp"
@@ -46,7 +46,7 @@ openstack-phase2:
- "lxc:nodes-api=0"
ceph:
branch: "lp:~openstack-charmers/charms/trusty/ceph/next"
- num_units: 1
+ num_units: 2
options:
fsid: 5a791d94-980b-11e4-b6f6-3c970e8b1cf7
monitor-secret: AQAi5a9UeJXUExAA+By9u+GPhl8/XiUQ4nwI3A==
@@ -57,6 +57,7 @@ openstack-phase2:
# ceph-public-network: 192.168.0.0/24
to:
- "lxc:nodes-api=0"
+ - "lxc:nodes-api=0"
ceph-osd:
branch: "lp:~openstack-charmers/charms/trusty/ceph-osd/next"
num_units: 1
@@ -109,7 +110,7 @@ openstack-phase2:
- "lxc:nodes-api=0"
nova-compute:
branch: lp:~openstack-charmers/charms/trusty/nova-compute/next
- num_units: 1
+ num_units: 2
options:
openstack-origin-git: include-file://nova-master.yaml
enable-live-migration: true
@@ -118,7 +119,7 @@ openstack-phase2:
migration-auth-type: ssh
to:
- "nodes-compute=0"
-# - "nodes-compute=1"
+ - "nodes-compute=1"
nova-cloud-controller:
branch: lp:~openstack-charmers/charms/trusty/nova-cloud-controller/next
num_units: 1
@@ -283,7 +284,7 @@ trusty-liberty:
source: "cloud:trusty-liberty"
openstack-origin: "cloud:trusty-liberty"
series: trusty
- ceph-osd-replication-count: 1
+ ceph-osd-replication-count: 2
admin-role: admin
keystone-admin-role: admin
@@ -307,7 +308,7 @@ trusty-kilo:
openstack-origin: cloud:trusty-kilo
source: cloud:trusty-kilo
series: trusty
- ceph-osd-replication-count: 1
+ ceph-osd-replication-count: 2
admin-role: admin
keystone-admin-role: admin