summaryrefslogtreecommitdiffstats
path: root/ci/odl
diff options
context:
space:
mode:
Diffstat (limited to 'ci/odl')
-rwxr-xr-xci/odl/01-deploybundle.sh4
-rw-r--r--ci/odl/juju-deployer/ovs-odl-ha.yaml61
-rwxr-xr-xci/odl/juju-deployer/scripts/cloud-setup.sh4
-rwxr-xr-xci/odl/juju-deployer/scripts/glance.sh4
4 files changed, 46 insertions, 27 deletions
diff --git a/ci/odl/01-deploybundle.sh b/ci/odl/01-deploybundle.sh
index 8585d4b4..707eac06 100755
--- a/ci/odl/01-deploybundle.sh
+++ b/ci/odl/01-deploybundle.sh
@@ -42,7 +42,7 @@ case "$3" in
# choose the correct interface to use for data network
sed -i -- 's/#os-data-network: 10.4.8.0\/21/os-data-network: 10.4.9.0\/24/g' ./bundles.yaml
# Choose the external port to go out from gateway to use.
- sed -i -- 's/# "ext-port": "eth1"/ "ext-port": "eth2"/g' ./bundles.yaml
+ sed -i -- 's/# "ext-port": "eth1"/ "ext-port": "brPublic"/g' ./bundles.yaml
;;
'intelpod5' )
cp maas/intel/pod5/interfaces.host trusty/ubuntu-nodes-controller/network/interfaces.host
@@ -54,7 +54,7 @@ case "$3" in
# choose the correct interface to use for data network
sed -i -- 's/#os-data-network: 10.4.8.0\/21/os-data-network: 10.4.9.0\/24/g' ./bundles.yaml
# Choose the external port to go out from gateway to use.
- sed -i -- 's/# "ext-port": "eth1"/ "ext-port": "eth2.724"/g' ./bundles.yaml
+ sed -i -- 's/# "ext-port": "eth1"/ "ext-port": "brPublic"/g' ./bundles.yaml
;;
esac
diff --git a/ci/odl/juju-deployer/ovs-odl-ha.yaml b/ci/odl/juju-deployer/ovs-odl-ha.yaml
index f727c3ed..30b3757d 100644
--- a/ci/odl/juju-deployer/ovs-odl-ha.yaml
+++ b/ci/odl/juju-deployer/ovs-odl-ha.yaml
@@ -84,45 +84,46 @@ openstack-phase2:
branch: "lp:~openstack-charmers/charms/trusty/heat/next"
to:
- "lxc:nodes-api=0"
-# ceph:
-# charm: cs:trusty/ceph
-# num_units: 1
-# options:
-# fsid: 5a791d94-980b-11e4-b6f6-3c970e8b1cf7
-# monitor-secret: AQAi5a9UeJXUExAA+By9u+GPhl8/XiUQ4nwI3A==
-# osd-devices: /dev/sdb
+ ceph:
+ charm: cs:trusty/ceph
+ num_units: 1
+ options:
+ fsid: 5a791d94-980b-11e4-b6f6-3c970e8b1cf7
+ monitor-secret: AQAi5a9UeJXUExAA+By9u+GPhl8/XiUQ4nwI3A==
+ osd-devices: /srv
+ monitor-count: 1
# osd-reformat: 'yes'
-# source: cloud:trusty-kilo
-# to:
-# - "nodes-compute=0"
+# ceph-cluster-network: 192.168.0.0/24
+# ceph-public-network: 192.168.0.0/24
+ to:
+ - "nodes-compute=0"
+# - "nodes-compute=1"
# ceph-osd:
# charm: cs:trusty/ceph-osd
# num_units: 1
# options:
# osd-devices: /dev/sdb
# osd-reformat: 'yes'
-# source: cloud:trusty-kilo
# to:
# - "lxc:nodes-api=0"
# ceph-radosgw:
# charm: cs:trusty/ceph-radosgw
# num_units: 1
# options:
-# source: cloud:trusty-kilo
# use-embedded-webserver: true
# to:
# - "lxc:nodes-api=0"
-# cinder:
-# charm: cs:trusty/cinder
-# num_units: 1
-# options:
-# block-device: None
+ cinder:
+ charm: cs:trusty/cinder
+ num_units: 1
+ options:
+ block-device: None
# glance-api-version: 2
# ha-mcastport: 5401
-# to:
-# - "lxc:nodes-api=0"
-# cinder-ceph:
-# charm: cs:trusty/cinder-cep
+ to:
+ - "lxc:nodes-api=0"
+ cinder-ceph:
+ charm: cs:trusty/cinder-ceph
"rabbitmq-server":
branch: lp:charms/trusty/rabbitmq-server
num_units: 3
@@ -301,6 +302,24 @@ openstack-phase2:
- "keystone:identity-service"
- - "heat:amqp"
- "rabbitmq-server:amqp"
+ - - "cinder:image-service"
+ - "glance:image-service"
+ - - "cinder:amqp"
+ - "rabbitmq-server:amqp"
+ - - "cinder:identity-service"
+ - "keystone:identity-service"
+ - - "cinder:cinder-volume-service"
+ - "nova-cloud-controller:cinder-volume-service"
+ - - "cinder-ceph:storage-backend"
+ - "cinder:storage-backend"
+ - - "ceph:client"
+ - "nova-compute:ceph"
+ - - "cinder:shared-db"
+ - "percona-cluster:shared-db"
+ - - "ceph:client"
+ - "cinder-ceph:ceph"
+ - - "ceph:client"
+ - "glance:ceph"
trusty-liberty-nodes:
inherits: openstack-phase1
overrides:
diff --git a/ci/odl/juju-deployer/scripts/cloud-setup.sh b/ci/odl/juju-deployer/scripts/cloud-setup.sh
index b151ce36..184cecc6 100755
--- a/ci/odl/juju-deployer/scripts/cloud-setup.sh
+++ b/ci/odl/juju-deployer/scripts/cloud-setup.sh
@@ -17,8 +17,8 @@ keystone user-create --name demo --tenant demo --pass demo --email demo@demo.dem
nova keypair-add --pub-key id_rsa.pub ubuntu-keypair
# configure external network
-neutron net-create --router:external --provider:physical_network external --provider:network_type flat ext-net
-neutron subnet-create --name ext-subnet --no-gateway --allocation-pool start=10.2.65.201,end=10.2.65.254 --disable-dhcp ext-net 10.2.65.0/24
+neutron net-create ext-net --router:external --provider:physical_network external --provider:network_type flat
+neutron subnet-create ext-net --name ext-subnet --allocation-pool start=10.5.8.5,end=10.5.8.254 --disable-dhcp --gateway 10.5.8.1 10.5.8.0/24
# create vm network
neutron net-create demo-net
diff --git a/ci/odl/juju-deployer/scripts/glance.sh b/ci/odl/juju-deployer/scripts/glance.sh
index 82c84bbe..a18afe6c 100755
--- a/ci/odl/juju-deployer/scripts/glance.sh
+++ b/ci/odl/juju-deployer/scripts/glance.sh
@@ -4,6 +4,6 @@
wget -P /tmp/images http://download.cirros-cloud.net/0.3.3/cirros-0.3.3-x86_64-disk.img
wget -P /tmp/images http://cloud-images.ubuntu.com/trusty/current/trusty-server-cloudimg-amd64-disk1.img
-glance image-create --name "cirros-0.3.3-x86_64" --file /tmp/images/cirros-0.3.3-x86_64-disk.img --disk-format qcow2 --container-format bare --is-public True --owner admin --progress
-glance image-create --name "ubuntu-trusty-daily" --file /tmp/images/trusty-server-cloudimg-amd64-disk1.img --disk-format qcow2 --container-format bare --is-public True --owner admin --progress
+glance image-create --name "cirros-0.3.3-x86_64" --file /tmp/images/cirros-0.3.3-x86_64-disk.img --disk-format qcow2 --container-format bare --progress
+glance image-create --name "ubuntu-trusty-daily" --file /tmp/images/trusty-server-cloudimg-amd64-disk1.img --disk-format qcow2 --container-format bare --progress
rm -rf /tmp/images