modified the bundle to include the ceph and cinder changes.

[joid.git] / ci / odl / juju-deployer / scripts / cloud-setup.sh

diff --git a/ci/odl/juju-deployer/scripts/cloud-setup.sh b/ci/odl/juju-deployer/scripts/cloud-setup.sh
index b18d798..184cecc 100755 (executable)
--- a/ci/odl/juju-deployer/scripts/cloud-setup.sh
+++ b/ci/odl/juju-deployer/scripts/cloud-setup.sh
@@ -14,11 +14,11 @@ neutron security-group-rule-create --direction ingress --ethertype IPv4 --protoc
 keystone tenant-create --name demo --description "Demo Tenant"
 keystone user-create --name demo --tenant demo --pass demo --email demo@demo.demo
 
-nova keypair-add --pub-key ~/.ssh/id_rsa.pub ubuntu-keypair
+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.255 --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
@@ -33,7 +33,7 @@ neutron router-gateway-set demo-router ext-net
 # create pool of floating ips
 i=0
 while [ $i -ne 10 ]; do
-       neutron floatingip-create public-net
+       neutron floatingip-create ext-net
        i=$((i + 1))
 done