summaryrefslogtreecommitdiffstats
path: root/ci
diff options
context:
space:
mode:
authorNarinder Gupta <narinder.gupta@canonical.com>2015-11-24 14:49:15 -0600
committerNarinder Gupta <narinder.gupta@canonical.com>2015-11-24 15:07:56 -0600
commitfbb631733aec9f7d7e9e125a5a3978e1defa370d (patch)
treef9d5bb0a4656e584c91d2ec454775c86bdb3c683 /ci
parent2ac508a0f3fb99e6af8474603b75da9f54576b06 (diff)
modified the bundle to include the ceph and cinder changes.
added ceph to use the single size of minimum. Author: Narinder Gupta <narinder.gupta@canonical.com> Change-Id: I81cd7e80667759969fa511a1879b3201ca94c87d
Diffstat (limited to 'ci')
-rw-r--r--ci/odl/juju-deployer/ovs-odl-ha.yaml6
-rwxr-xr-xci/odl/juju-deployer/scripts/openstack.sh3
2 files changed, 6 insertions, 3 deletions
diff --git a/ci/odl/juju-deployer/ovs-odl-ha.yaml b/ci/odl/juju-deployer/ovs-odl-ha.yaml
index ae333d27..b4811ec1 100644
--- a/ci/odl/juju-deployer/ovs-odl-ha.yaml
+++ b/ci/odl/juju-deployer/ovs-odl-ha.yaml
@@ -119,7 +119,7 @@ openstack-phase2:
options:
block-device: None
glance-api-version: 2
- ha-mcastport: 5401
+# ha-mcastport: 5401
to:
- "lxc:nodes-api=0"
cinder-ceph:
@@ -137,7 +137,7 @@ openstack-phase2:
branch: lp:charms/trusty/keystone
num_units: 3
options:
- ha-mcastport: 5402
+# ha-mcastport: 5402
"admin-password": openstack
"admin-token": admin
vip: 10.4.1.13
@@ -216,7 +216,7 @@ openstack-phase2:
options:
ceph-osd-replication-count: 1
vip: 10.4.1.12
- ha-mcastport: 5402
+# ha-mcastport: 5402
to:
- "lxc:nodes-api=0"
- "lxc:nodes-api=1"
diff --git a/ci/odl/juju-deployer/scripts/openstack.sh b/ci/odl/juju-deployer/scripts/openstack.sh
index e12ebbfd..93daa908 100755
--- a/ci/odl/juju-deployer/scripts/openstack.sh
+++ b/ci/odl/juju-deployer/scripts/openstack.sh
@@ -21,6 +21,9 @@ unitMachine()
juju status | python -c "import yaml; import sys; print yaml.load(sys.stdin)[\"services\"][\"$1\"][\"units\"][\"$1/$2\"][\"machine\"]" 2> /dev/null
}
+juju run --service ceph 'sudo ceph osd pool set cinder-ceph size 1'
+juju run --service ceph 'sudo ceph osd pool set cinder-ceph min_size 1'
+
mkdir -m 0700 -p cloud
controller_address=$(unitAddress keystone 0)
configOpenrc admin openstack admin http://$controller_address:5000/v2.0 Canonical > cloud/admin-openrc