modified to increase number of compute nodes.

Change-Id: I50995124f2969108b3f5789f4bd7cba17cfb44c9
(cherry picked from commit c26144a788c3451ce1268c8419d6efc7b1048656)

diff --git a/ci/nosdn/juju-deployer/ovs-nosdn-nonha.yaml b/ci/nosdn/juju-deployer/ovs-nosdn-nonha.yaml
index 497ff07..b4ec750 100644 (file)
--- a/ci/nosdn/juju-deployer/ovs-nosdn-nonha.yaml
+++ b/ci/nosdn/juju-deployer/ovs-nosdn-nonha.yaml
@@ -131,7 +131,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
@@ -139,7 +139,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/nosdn/juju-deployer/ovs-nosdn-tip.yaml b/ci/nosdn/juju-deployer/ovs-nosdn-tip.yaml
index 4eb6c6f..ef36858 100644 (file)
--- a/ci/nosdn/juju-deployer/ovs-nosdn-tip.yaml
+++ b/ci/nosdn/juju-deployer/ovs-nosdn-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,14 +57,16 @@ 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
+      num_units: 2
       options:
         osd-devices: /srv
         osd-reformat: 'yes'
       to:
         - "nodes-compute=0"
+        - "nodes-compute=1"
     ceph-radosgw:
       branch: "lp:~openstack-charmers/charms/trusty/ceph-radosgw/next"
       num_units: 1
@@ -109,7 +111,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 +120,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
@@ -266,7 +268,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
 
@@ -290,7 +292,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
 

diff --git a/ci/odl/juju-deployer/ovs-odl-nonha.yaml b/ci/odl/juju-deployer/ovs-odl-nonha.yaml
index ee090b0..30deb14 100644 (file)
--- 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 79b10c1..37cb6c1 100644 (file)
--- 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