summaryrefslogtreecommitdiffstats
path: root/ci/openstack.sh
diff options
context:
space:
mode:
authorNarinder Gupta <narinder.gupta@canonical.com>2016-06-14 19:27:27 -0500
committerNarinder Gupta <narinder.gupta@canonical.com>2016-06-15 00:41:05 -0500
commit7208685b13a35f7f25cb4a7221058f358453cb50 (patch)
tree4b34bf24a7d1ed8213318aec4a173284f9aab6f8 /ci/openstack.sh
parentb2aea8c07c74ea8e35ddc8d5a50beb1c4b65d04b (diff)
modified to clean the environment and also change in bundles to
deploy ocl as well. Change-Id: I40f32bad5b94b335bd5bd37d3c626d4a5e336061 Signed-off-by: Narinder Gupta <narinder.gupta@canonical.com>
Diffstat (limited to 'ci/openstack.sh')
-rwxr-xr-xci/openstack.sh10
1 files changed, 5 insertions, 5 deletions
diff --git a/ci/openstack.sh b/ci/openstack.sh
index 1e82ff9b..2750bc51 100755
--- a/ci/openstack.sh
+++ b/ci/openstack.sh
@@ -76,10 +76,10 @@ create_openrc
. ./cloud/admin-openrc
wget -P /tmp/images http://download.cirros-cloud.net/0.3.3/cirros-0.3.3-x86_64-disk.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 --progress
+openstack image create --file /tmp/images/cirros-0.3.3-x86_64-disk.img --disk-format qcow2 --container-format bare "cirros-0.3.3-x86_64"
#wget -P /tmp/images http://cloud-images.ubuntu.com/trusty/current/trusty-server-cloudimg-amd64-disk1.img
-#glance image-create --name "ubuntu-trusty-daily" --file /tmp/images/trusty-server-cloudimg-amd64-disk1.img --disk-format qcow2 --container-format bare --progress
+#openstack image create --file /tmp/images/trusty-server-cloudimg-amd64-disk1.img --disk-format qcow2 --container-format bare "ubuntu-trusty-daily"
rm -rf /tmp/images
# adjust tiny image
@@ -88,10 +88,10 @@ rm -rf /tmp/images
# import key pair
-keystone tenant-create --name demo --description "Demo Tenant"
-keystone user-create --name demo --tenant demo --pass demo --email demo@demo.demo
+openstack project create --description "Demo Tenant" demo
+openstack user create --project demo --password demo --email demo@demo.demo demo
-nova keypair-add --pub-key ~/.ssh/id_rsa.pub ubuntu-keypair
+openstack keypair create --public-key ~/.ssh/id_rsa.pub ubuntu-keypair
# configure external network