summaryrefslogtreecommitdiffstats
path: root/ci/opencontrail/juju-deployer
diff options
context:
space:
mode:
authorNarinder Gupta <narinder.gupta@canonical.com>2015-12-10 15:02:15 -0600
committerNarinder Gupta <narinder.gupta@canonical.com>2015-12-11 06:09:34 -0600
commit85e65d41f1cdc9c9291fb5b2de29c02f0e57b405 (patch)
treec5d39fa342ec759c991868575fa1deb682c49bbb /ci/opencontrail/juju-deployer
parente881980f26d97ee17a9c72cb25226e2ef36a96bc (diff)
modified the yaml on request from David from Orange so that
devices option can be modified to format the osd device. modified deploy.sh so that return value is positive. Change-Id: Idc94f4a99889df88bfae6446ce212050a570d30a
Diffstat (limited to 'ci/opencontrail/juju-deployer')
-rw-r--r--ci/opencontrail/juju-deployer/contrail-ha.yaml2
-rw-r--r--ci/opencontrail/juju-deployer/contrail-tip.yaml2
-rw-r--r--ci/opencontrail/juju-deployer/contrail.yaml2
3 files changed, 3 insertions, 3 deletions
diff --git a/ci/opencontrail/juju-deployer/contrail-ha.yaml b/ci/opencontrail/juju-deployer/contrail-ha.yaml
index cbe6b660..686ba847 100644
--- a/ci/opencontrail/juju-deployer/contrail-ha.yaml
+++ b/ci/opencontrail/juju-deployer/contrail-ha.yaml
@@ -109,7 +109,7 @@ openstack-phase2:
monitor-secret: AQAi5a9UeJXUExAA+By9u+GPhl8/XiUQ4nwI3A==
osd-devices: /srv
monitor-count: 1
-# osd-reformat: 'yes'
+ osd-reformat: 'no'
# ceph-cluster-network: 192.168.0.0/24
# ceph-public-network: 192.168.0.0/24
to:
diff --git a/ci/opencontrail/juju-deployer/contrail-tip.yaml b/ci/opencontrail/juju-deployer/contrail-tip.yaml
index a329dc6f..da32c8fa 100644
--- a/ci/opencontrail/juju-deployer/contrail-tip.yaml
+++ b/ci/opencontrail/juju-deployer/contrail-tip.yaml
@@ -63,7 +63,7 @@ openstack-phase2:
monitor-secret: AQAi5a9UeJXUExAA+By9u+GPhl8/XiUQ4nwI3A==
osd-devices: /srv
monitor-count: 1
-# osd-reformat: 'yes'
+ osd-reformat: 'no'
# ceph-cluster-network: 192.168.0.0/24
# ceph-public-network: 192.168.0.0/24
to:
diff --git a/ci/opencontrail/juju-deployer/contrail.yaml b/ci/opencontrail/juju-deployer/contrail.yaml
index c9770df7..ec58c058 100644
--- a/ci/opencontrail/juju-deployer/contrail.yaml
+++ b/ci/opencontrail/juju-deployer/contrail.yaml
@@ -63,7 +63,7 @@ openstack-phase2:
monitor-secret: AQAi5a9UeJXUExAA+By9u+GPhl8/XiUQ4nwI3A==
osd-devices: /srv
monitor-count: 1
-# osd-reformat: 'yes'
+ osd-reformat: 'no'
# ceph-cluster-network: 192.168.0.0/24
# ceph-public-network: 192.168.0.0/24
to: