diff options
| -rwxr-xr-x | ci/odl/juju-deployer/scripts/cloud-setup.sh | 6 | ||||
| -rwxr-xr-x | ci/odl/juju-deployer/scripts/glance.sh | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/ci/odl/juju-deployer/scripts/cloud-setup.sh b/ci/odl/juju-deployer/scripts/cloud-setup.sh index b18d798f..b151ce36 100755 --- 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 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 # 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 diff --git a/ci/odl/juju-deployer/scripts/glance.sh b/ci/odl/juju-deployer/scripts/glance.sh index d02f6d06..82c84bbe 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 ubuntu-trusty-daily --disk-format qcow2 --container-format bare --owner admin --file /tmp/imaes/trusty-server-cloudimg-amd64-disk1.img --checksum $(grep trusty-server-cloudimg-amd64-disk1.img MD5SUMS | cut -d " " -f 1) --is-public True -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 "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 rm -rf /tmp/images |