summaryrefslogtreecommitdiffstats
path: root/ci
diff options
context:
space:
mode:
authorNarinder Gupta <narinder.gupta@canonical.com>2016-01-13 22:25:00 -0600
committerNarinder Gupta <narinder.gupta@canonical.com>2016-01-14 16:15:32 +0000
commit961571ebcfb6e1102fd16949578f7ebecc77756d (patch)
tree3099f391f1c805a3dfd5b412a520e116c41da31e /ci
parent192a4ee2d87c265f217cd4672f2f28983c5dccf5 (diff)
type replaced Memeber with Member. Reducing the OSD to signle
node. Change-Id: I4e2f352f60c6a71dddf9cb48fefa412863f89594 (cherry picked from commit 100d4a7f6b945428e94930b6c6528191277c8af3)
Diffstat (limited to 'ci')
-rw-r--r--ci/nosdn/juju-deployer/ovs-ha.yaml2
-rw-r--r--ci/nosdn/juju-deployer/ovs.yaml2
-rw-r--r--ci/odl/juju-deployer/ovs-odl-ha.yaml6
-rw-r--r--ci/onos/juju-deployer/onos-ha.yaml2
-rw-r--r--ci/opencontrail/juju-deployer/contrail-ha.yaml2
5 files changed, 6 insertions, 8 deletions
diff --git a/ci/nosdn/juju-deployer/ovs-ha.yaml b/ci/nosdn/juju-deployer/ovs-ha.yaml
index 5b5845c5..6d273c89 100644
--- a/ci/nosdn/juju-deployer/ovs-ha.yaml
+++ b/ci/nosdn/juju-deployer/ovs-ha.yaml
@@ -58,7 +58,7 @@ openstack-phase2:
num_units: 1
options:
use-embedded-webserver: true
- operator-roles: "Memeber,admin"
+ operator-roles: "Member,admin"
to:
- "lxc:nodes-api=0"
cinder:
diff --git a/ci/nosdn/juju-deployer/ovs.yaml b/ci/nosdn/juju-deployer/ovs.yaml
index 46659686..b7d127d1 100644
--- a/ci/nosdn/juju-deployer/ovs.yaml
+++ b/ci/nosdn/juju-deployer/ovs.yaml
@@ -53,7 +53,7 @@ openstack-phase2:
num_units: 1
options:
use-embedded-webserver: true
- operator-roles: "Memeber,admin"
+ operator-roles: "Member,admin"
to:
- "lxc:nodes-api=0"
cinder:
diff --git a/ci/odl/juju-deployer/ovs-odl-ha.yaml b/ci/odl/juju-deployer/ovs-odl-ha.yaml
index 8800d8a0..144bb1dd 100644
--- a/ci/odl/juju-deployer/ovs-odl-ha.yaml
+++ b/ci/odl/juju-deployer/ovs-odl-ha.yaml
@@ -100,20 +100,18 @@ openstack-phase2:
- "nodes-compute=1"
ceph-osd:
charm: cs:trusty/ceph-osd
- num_units: 3
+ num_units: 1
options:
osd-devices: /srv
osd-reformat: 'yes'
to:
- - "nodes-api=0"
- "nodes-api=1"
- - "nodes-api=2"
ceph-radosgw:
charm: cs:trusty/ceph-radosgw
num_units: 1
options:
use-embedded-webserver: true
- operator-roles: "Memeber,admin"
+ operator-roles: "Member,admin"
to:
- "lxc:nodes-api=0"
cinder:
diff --git a/ci/onos/juju-deployer/onos-ha.yaml b/ci/onos/juju-deployer/onos-ha.yaml
index 802f8073..c58501a3 100644
--- a/ci/onos/juju-deployer/onos-ha.yaml
+++ b/ci/onos/juju-deployer/onos-ha.yaml
@@ -111,7 +111,7 @@ openstack-phase2:
num_units: 3
options:
use-embedded-webserver: true
- operator-roles: "Memeber,admin"
+ operator-roles: "Member,admin"
to:
- "lxc:nodes-api=1"
- "lxc:nodes-api=0"
diff --git a/ci/opencontrail/juju-deployer/contrail-ha.yaml b/ci/opencontrail/juju-deployer/contrail-ha.yaml
index 20545145..90b85f68 100644
--- a/ci/opencontrail/juju-deployer/contrail-ha.yaml
+++ b/ci/opencontrail/juju-deployer/contrail-ha.yaml
@@ -130,7 +130,7 @@ openstack-phase2:
num_units: 1
options:
use-embedded-webserver: true
- operator-roles: "Memeber,admin"
+ operator-roles: "Member,admin"
to:
- "lxc:nodes-api=0"