change openstack client commands to use new unified openstack cli

3 files changed, 21 insertions, 23 deletions

diff --git a/devstack/install-devstack.sh b/devstack/install-devstack.sh
index 95fa8f9..e3d83f7 100755
--- a/devstack/install-devstack.sh
+++ b/devstack/install-devstack.sh
@@ -74,11 +74,6 @@ ln -sfr $d /var/tmp/devstack
 
 . /var/tmp/devstack/devstack/openrc admin admin
 
-for imagename in $(glance image-list | awk "/cirros.*ami/{print \$4}")
-do
-   ./local-update-image-properties ${imagename}
-done
-
 if [ "${LAVA_ADD_RALLY:-yes}" = "yes" ]; then
     wget --progress=dot -e dotbytes=10M -O cirros-arm64-uec.tar.gz \
 	 http://people.linaro.org/~clark.laughlin/vivid-server-cloudimg-arm64-linaro.tar.gz
@@ -87,8 +82,11 @@ if [ "${LAVA_ADD_RALLY:-yes}" = "yes" ]; then
     /var/tmp/devstack/devstack/tools/upload_image.sh file://$PWD/cirros-arm64-uec.tar.gz
     /var/tmp/devstack/devstack/tools/upload_image.sh file://$PWD/rally-from-image.tar.gz
     /var/tmp/devstack/devstack/tools/upload_image.sh file://$PWD/rally-to-image.tar.gz
-    ./local-update-image-properties $(glance image-list | awk "/cirros-arm64-uec.*ami/{print \$4}")
-    ./local-update-image-properties $(glance image-list | awk "/rally.*ami/{print \$4}")
 fi
 
+for imageid in $(openstack image list --format=value --property container_format=ami -c=ID)
+do
+    ./local-update-image-properties ${imageid}
+done
+
 #sed -i -e 's/ssh_user = cirros/ssh_user = ubuntu/' /opt/stack/tempest/etc/tempest.conf
diff --git a/devstack/local-update-image-properties b/devstack/local-update-image-properties
index d8c43d3..625d6b4 100755
--- a/devstack/local-update-image-properties
+++ b/devstack/local-update-image-properties
@@ -12,7 +12,9 @@ echo "Update image ${1} with properties required to run as a mach-virt guest"
 # configures nova to use a config drive rather than metadata
 # service by default and that ends up being /dev/vda). The order
 # of virtio block devices is not ABI, but this works for now.
-glance image-update ${1}  \
+openstack image set ${1}  \
     --property hw_scsi_model='virtio-scsi' \
     --property hw_disk_bus='scsi' \
     --property os_command_line='root=/dev/sda rw rootwait console=ttyAMA0' || true
+
+openstack image show ${1}
diff --git a/devstack/local.sh b/devstack/local.sh
index a953e9b..0c3fe63 100755
--- a/devstack/local.sh
+++ b/devstack/local.sh
@@ -11,7 +11,7 @@ source $TOP_DIR/openrc admin admin
 
 echo "* Create Linaro SSH keypair"
 if [[ -z $(nova keypair-list | grep $KEY_NAME) ]]; then
-    nova keypair-add --pub-key ~/.ssh/id_rsa.pub ${KEY_NAME}
+    openstack keypair create --public-key ~/.ssh/id_rsa.pub ${KEY_NAME}
 fi
 
 echo "* Checking for enabled / disabled services"
@@ -52,19 +52,18 @@ check_service_status \
     zaqar-server
 
 echo "* Adding additional security group rules to allow SSH, ping"
-#if is_service_enabled nova; then
-    nova secgroup-add-rule default tcp 22 22 0.0.0.0/0
-    nova secgroup-add-rule default icmp -1 -1 0.0.0.0/0
-#fi
+openstack security group rule create default --proto=tcp --dst-port=22 --src-ip=0.0.0.0/0
+openstack security group rule create default --proto=icmp --dst-port=-1 --src-ip=0.0.0.0/0
+openstack security group rule list default
 
 echo "* Updating flavors"
 set +e
 # The default m1.nano and m1.micro RAM size are too small on ARMv8.
-nova flavor-delete m1.nano
-nova flavor-delete m1.micro
-nova flavor-create m1.nano 42 128 0 1
-nova flavor-create m1.micro 84 192 0 1
-nova flavor-list
+openstack flavor delete m1.nano
+openstack flavor delete m1.micro
+openstack flavor create m1.nano --id 42 --ram 128 --disk 0 --vcpus 1
+openstack flavor create m1.micro --id 84 --ram 192 --disk 0 --vcpus 1
+openstack flavor list
 
 
 # do these two steps also for the demo tenant:
@@ -73,11 +72,10 @@ echo "Switching to 'demo' tenant"
 source $TOP_DIR/openrc demo demo
 
 echo "* Adding additional security group rules to allow SSH, ping"
-#if is_service_enabled nova; then
-    nova secgroup-add-rule default tcp 22 22 0.0.0.0/0
-    nova secgroup-add-rule default icmp -1 -1 0.0.0.0/0
-#fi
+openstack security group rule create default --proto=tcp --dst-port=22 --src-ip=0.0.0.0/0
+openstack security group rule create default --proto=icmp --dst-port=-1 --src-ip=0.0.0.0/0
+openstack security group rule list default
 
 echo "* Create Linaro SSH keypair"
-nova keypair-add --pub-key ~/.ssh/id_rsa.pub ${KEY_NAME}
+openstack keypair create --public-key ~/.ssh/id_rsa.pub ${KEY_NAME}