From: Narinder Gupta <narinder.gupta@canonical.com>
Date: Thu, 10 Mar 2016 18:34:25 +0000 (-0600)
Subject: modified to fix the typo error.
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F79%2F11379%2F1;p=joid.git

modified to fix the typo error.

Change-Id: Ie44f4ab6438257d307dc9d2d397107b1b94e598b
(cherry picked from commit 35e90150aae27ecca44d608a32206d9089621b78)
---

diff --git a/ci/opencontrail/juju-deployer/ovs-opencontrail-nonha.yaml b/ci/opencontrail/juju-deployer/ovs-opencontrail-nonha.yaml
index c3b7160e..44d4bc8d 100644
--- a/ci/opencontrail/juju-deployer/ovs-opencontrail-nonha.yaml
+++ b/ci/opencontrail/juju-deployer/ovs-opencontrail-nonha.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"
@@ -60,7 +60,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==
@@ -71,14 +71,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
@@ -240,7 +242,7 @@ contrail:
     - [ contrail-analytics, ntp ]
 
 
-/trusty-liberty-nodes:
+trusty-liberty-nodes:
   inherits: openstack-phase1
   series: trusty
   overrides:
@@ -257,7 +259,7 @@ trusty-liberty:
     region: Canonical
     openstack-origin: cloud:trusty-liberty
     source: "cloud:trusty-liberty"
-    ceph-osd-replication-count: 1
+    ceph-osd-replication-count: 2
     admin-role: admin
     keystone-admin-role: admin
 
@@ -278,7 +280,7 @@ trusty-kilo:
     region: Canonical
     openstack-origin: cloud:trusty-kilo
     source: "cloud:trusty-kilo"
-    ceph-osd-replication-count: 1
+    ceph-osd-replication-count: 2
     admin-role: admin
     keystone-admin-role: admin
 
@@ -298,7 +300,7 @@ trusty-juno:
     region: Canonical
     openstack-origin: cloud:trusty-juno
     source: "cloud:trusty-juno"
-    ceph-osd-replication-count: 1
+    ceph-osd-replication-count: 2
     admin-role: admin
     keystone-admin-role: admin
 
diff --git a/ci/opencontrail/juju-deployer/ovs-opencontrail-tip.yaml b/ci/opencontrail/juju-deployer/ovs-opencontrail-tip.yaml
index 71dd673c..c792310a 100644
--- a/ci/opencontrail/juju-deployer/ovs-opencontrail-tip.yaml
+++ b/ci/opencontrail/juju-deployer/ovs-opencontrail-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"
@@ -60,7 +60,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==
@@ -71,14 +71,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
@@ -244,6 +246,7 @@ contrail:
     - [ "ceph-osd:mon", "ceph:osd" ]
     - [ "ceph-radosgw:mon", "ceph:radosgw" ]
     - [ "ceph-radosgw:identity-service", "keystone:identity-service" ]
+
 trusty-liberty-nodes:
   inherits: openstack-phase1
   overrides:
@@ -260,7 +263,7 @@ trusty-liberty:
     region: Canonical
     openstack-origin: cloud:trusty-liberty
     source: "cloud:trusty-liberty"
-    ceph-osd-replication-count: 1
+    ceph-osd-replication-count: 2
     admin-role: admin
     keystone-admin-role: admin
 
@@ -280,7 +283,7 @@ trusty-kilo:
     region: Canonical
     openstack-origin: cloud:trusty-kilo
     source: "cloud:trusty-kilo"
-    ceph-osd-replication-count: 1
+    ceph-osd-replication-count: 2
     admin-role: admin
     keystone-admin-role: admin
 
@@ -300,7 +303,7 @@ trusty-juno:
     region: Canonical
     openstack-origin: cloud:trusty-juno
     source: "cloud:trusty-juno"
-    ceph-osd-replication-count: 1
+    ceph-osd-replication-count: 2
     admin-role: admin
     keystone-admin-role: admin