Merge lp:~1chb1n/openstack-charm-testing/update-tools-profiles into lp:openstack-charm-testing

[Ryan Beisner]

Update tools to use openstackclient; update arm64 config profile

[lp:~1chb1n/openstack-charm-testing/update-tools-profiles]

292. By Ryan Beisner on 2017-03-23

Update instance stop, start, delete scripts

293. By Ryan Beisner on 2017-03-23

Update instance stop, start scripts

294. By Ryan Beisner on 2017-03-23

Update instance ssh connect check script

295. By Ryan Beisner on 2017-03-27

Rebase trunk

=== modified file 'novarc'
--- novarc	2016-05-20 10:26:04 +0000
+++ novarc	2017-03-27 20:54:03 +0000
@@ -1,4 +1,8 @@
-#!/bin/bash
+_OS_PARAMS=$(env | awk 'BEGIN {FS="="} /^OS_/ {print $1;}' | paste -sd ' ')
+for param in $_OS_PARAMS; do
+    unset $param
+done
+unset _OS_PARAMS
 export OS_USERNAME=admin
 export OS_PASSWORD=openstack
 export OS_TENANT_NAME=admin

=== modified file 'profiles/arm64'
--- profiles/arm64	2017-02-07 20:32:21 +0000
+++ profiles/arm64	2017-03-27 20:54:03 +0000
@@ -2,12 +2,7 @@
 # An experimental configuration script for configuring a ppc64el OpenStack test cloud.
 # Useful in manual deployment testing.
 
-# Install CLI tools
-#sudo apt-get install git testrepository subunit python-nose python-lxml python-boto \
-#    python-junitxml python-subunit python-testresources python-oslotest python-stevedore \
-#    python-cinderclient python-glanceclient python-heatclient python-keystoneclient \
-#    python-neutronclient python-novaclient python-swiftclient python-ceilometerclient \
-#    openvswitch-test openvswitch-common python-openstackclient -y
+. ./profiles/common
 
 [[ -z "$GATEWAY" ]] && export GATEWAY="10.245.168.1"
 [[ -z "$CIDR_EXT" ]] && export CIDR_EXT="10.245.168.0/21"
@@ -15,21 +10,19 @@
 [[ -z "$NAMESERVER" ]] && export NAMESERVER="10.245.168.6"
 [[ -z "$CIDR_PRIV" ]] && export CIDR_PRIV="172.16.0.0/22"
 
+export BARE_METAL="True"
+
 # Accept network type as first parameter, assume gre if unspecified
 net_type=${1:-"gre"}
 
 # Configure neutron networking on overcloud
 source novarc
-./bin/quantum-ext-net --network-type $net_type -g $GATEWAY -c $CIDR_EXT -f $FIP_RANGE ext_net
-./bin/quantum-tenant-net --network-type $net_type -t admin -r provider-router -N $NAMESERVER private $CIDR_PRIV
+./bin/neutron-ext-net --network-type flat -g $GATEWAY -c $CIDR_EXT -f $FIP_RANGE ext_net
+./bin/neutron-tenant-net --network-type $net_type -t admin -r provider-router -N $NAMESERVER private $CIDR_PRIV
 
-# Create demo user and tenant
-keystone tenant-create --name demo || :
-keystone user-create --name demo --tenant demo --pass pass --enabled true --email [e-mail] || :
-keystone user-role-add --user demo --role Member --tenant demo || :
-keystone tenant-create --name alt_demo || :
-keystone user-create --name alt_demo --tenant alt_demo --pass secret --enabled true --email [e-mail] || :
-keystone user-role-add --user alt_demo --role Member --tenant alt_demo || :
+create_tempest_users
+create_tempest_flavors
+create_default_flavors
 
 # Install monitoring, probing and troubleshooting tools on all units
 juju run --all "sudo apt-get install htop atop nload iptraf nmap multitail iperf pastebinit stress sysstat -y"
@@ -43,4 +36,3 @@
 # Tune for higher-density testing
 tools/flavor_shrink.sh
 tools/quota_million.sh
-

=== modified file 'tools/flavor_shrink.sh'
--- tools/flavor_shrink.sh	2015-02-20 18:31:41 +0000
+++ tools/flavor_shrink.sh	2017-03-27 20:54:03 +0000
@@ -2,7 +2,7 @@
 # Shrink flavors for density testing
 
 echo " + Shrinking flavors."
-nova flavor-delete m1.small
-nova flavor-delete m1.medium
+nova flavor-delete m1.small ||:
+nova flavor-delete m1.medium ||:
 nova flavor-create --ephemeral 0 --is-public True m1.small 2 512 20 1
 nova flavor-create --ephemeral 0 --is-public True m1.medium 3 1024 40 2

=== modified file 'tools/flavor_shrink_less.sh'
--- tools/flavor_shrink_less.sh	2015-04-10 15:06:12 +0000
+++ tools/flavor_shrink_less.sh	2017-03-27 20:54:03 +0000
@@ -2,11 +2,11 @@
 # Shrink flavors for density testing
 
 echo " + Shrinking flavors."
-nova flavor-delete m1.tiny
-nova flavor-delete m1.small
-nova flavor-delete m1.medium
-nova flavor-delete m1.large
-nova flavor-delete m1.xlarge
+nova flavor-delete m1.tiny ||:
+nova flavor-delete m1.small ||:
+nova flavor-delete m1.medium ||:
+nova flavor-delete m1.large ||:
+nova flavor-delete m1.xlarge ||:
 nova flavor-create --ephemeral 20 --is-public True m1.tiny 1 512 20 1
 nova flavor-create --ephemeral 20 --is-public True m1.small 2 3072 20 2
 nova flavor-create --ephemeral 40 --is-public True m1.medium 3 4096 40 2

=== modified file 'tools/float_all.sh'
--- tools/float_all.sh	2016-02-11 12:32:37 +0000
+++ tools/float_all.sh	2017-03-27 20:54:03 +0000
@@ -1,22 +1,21 @@
-#!/bin/bash
+#!/bin/bash -ex
 # Give all instances a floating IP address.
+# Requires >= Newton openstack client
 
 echo " + Floating all instances."
 
 function get_ip_f() {
   # Get first unallocated floating IP
-  local var=$(nova floating-ip-list | grep '\-  ' | awk '{ print $4 }' | head -n 1)
-  echo $var
+  openstack floating ip list | awk '/None/ { print $4 }' | head -n 1
 }
 
-fips=$(nova floating-ip-list | grep '\-  ' | awk '{ print $2 }')
-fip_count=$(echo $fips | wc -w)
-
-instances=$(nova list | grep ACTIVE | grep -v '\,' | awk '{ print $2 }')
+fip_count=$(openstack floating ip list | awk '/None/ { print $4 }' | wc -l)
+instances=$(openstack server list | grep ACTIVE | grep -v '\,' | awk '{ print $2 }')
 inst_count=$(echo $instances | wc -w)
 
 if [[ -z "$instances" ]]; then
-  echo " . It appears that no instances need a floating IP."
+  set +x
+  echo " . It appears that no instance needs a floating IP."
   exit 0
 fi
 
@@ -27,13 +26,14 @@
   fip_diff=$(( $inst_count - $fip_count ))
   echo " + Creating $fip_diff more floating IPs."
   for m in $(seq 1 $fip_diff); do
-    nova floating-ip-create
+    openstack floating ip create ext_net
   done
 fi
 
 # Allocate floating IPs to instances.
-for i in $instances; do
+for instance in $instances; do
   ip_f=$(get_ip_f)
-  echo " + Associating floating IP $ip_f to instance $i."
-  nova floating-ip-associate $i $ip_f
+  echo " + Associating floating IP $ip_f to instance $instance."
+  openstack server add floating ip $instance $ip_f
 done
+

=== added file 'tools/instance_delete_all.sh'
--- tools/instance_delete_all.sh	1970-01-01 00:00:00 +0000
+++ tools/instance_delete_all.sh	2017-03-27 20:54:03 +0000
@@ -0,0 +1,11 @@
+#!/bin/bash -ex
+if [[ -z "$WORKSPACE" ]]; then
+  set +x
+  echo -e "\n/!\ This script will delete all nova instances it can find, which is dangerous.  It is intended
+    to be used from Jenkins test automation.  If you really wish to use it, set a WORKSPACE env var
+    to allow it to run."
+  exit 1
+fi
+
+for i in $(openstack server list | awk '/=/{ print $2 }');do openstack server delete $i --wait; done
+

=== modified file 'tools/instance_launch.sh'
--- tools/instance_launch.sh	2016-09-30 09:29:50 +0000
+++ tools/instance_launch.sh	2017-03-27 20:54:03 +0000
@@ -1,41 +1,37 @@
-#!/bin/bash
+#!/bin/bash -ex
 # Launch N quantity of XYZ instances
 # Presumes glance images exist and have been imported using the
 # accompanying configure script.
 
-p_qty=$1
-p_name=$2
-if [ -z "$p_qty" ] || [ -z "$p_name" ]; then
-  echo "Launches N quantity of XYZ instances."
-  echo "Usage:  <this script> <qty of instances> <glance image name>"
-  echo "   ex:  ./instance_launch.sh 2 precise"
-  echo "   ex:  ./instance_launch.sh 10 cirros"
-  echo "   ex:  ./instance_launch.sh 25 trusty"
-  echo "   ex:  ./instance_launch.sh 10 vivid-ppc64el"
-  echo "   Cirros will assume m1.cirros flavor."
-  echo "   All others will use m1.small flabor."
+instance_qty=$1
+image_name=$2
+if [ -z "$instance_qty" ] || [ -z "$image_name" ]; then
+  set +x
+  echo "Launches N quantity of XYZ instances.
+Usage:  <this script> <qty of instances> <glance image name>
+   ex:  ./instance_launch.sh 10 xenial-ppc64el
+   Cirros images will use m1.cirros flavor.
+   All others will use m1.small flavor."
   exit 1
 fi
 
-echo " + Keying nova and ~/testkey.pem..."
-nova keypair-list | grep testkey &> /dev/null || { nova keypair-add testkey > ~/testkey.pem; chmod 600 ~/testkey.pem; }
-nova keypair-list | grep testkey
-
-echo " + Grabbing 'private' network ID..."
-net_id=$(neutron net-list | awk '/private/ {print $2}')
-
-echo " + Determining flavor to use..."
-if [[ "${p_name}" == *cirros* ]]; then
+# Key nova and ~/testkey.pem
+openstack keypair show testkey ||\
+    { openstack keypair create testkey > ~/testkey.pem; chmod 600 ~/testkey.pem; }
+
+# Grab private network ID
+net_id=$(openstack network list | awk '/private/ {print $2}')
+
+# Determining flavor to use
+if [[ "${image_name}" == *cirros* ]]; then
   flavor="m1.cirros"
 else
   flavor="m1.small"
 fi
 
-echo " + Nova booting ${p_qty} ${p_name} instances as flavor ${flavor}..."
-for m in $(seq 1 $p_qty); do
-  server_name="${p_name}$(date +'%H%M%S')"
-  echo ${server_name} ${p_name} ${net_id}
-  nova boot --image ${p_name} --flavor ${flavor} --key-name testkey --nic net-id=${net_id} $server_name
-done
-
-echo " + Hint:  use ssh -i ~/testkey.pem ubuntu@<ip> to access new instances (may also need a floating IP)."
+# Create instances
+server_name="${image_name}-$(date +'%H%M%S')"
+openstack server create --wait --image $image_name --flavor $flavor --key-name testkey --nic net-id=${net_id} --min $instance_qty --max $instance_qty $server_name
+
+# Hint:  use ssh -i ~/testkey.pem ubuntu@<ip> to access new instances (may also need a floating IP).
+

=== modified file 'tools/instance_ssh_ping_all.sh'
--- tools/instance_ssh_ping_all.sh	2015-04-02 03:52:38 +0000
+++ tools/instance_ssh_ping_all.sh	2017-03-27 20:54:03 +0000
@@ -1,11 +1,6 @@
-#!/bin/bash
-
-echo " + Attempting to ping and check ssh socket for all ACTIVE instances (must have floating IPs)."
-
-[[ -z "$1" ]] && count=2 || count="$1"
-
-for i in $(nova list | grep ACTIVE | awk '{ print $13 }'); do
-  echo ==== $i ====
-  nc -w $count $i 22 && echo "OK: ssh socket check" || echo "FAIL: ssh"
-  ping -c $count $i &> /dev/null && echo "OK: ping" || echo "FAIL: ping"
+#!/bin/bash -ex
+# Known good with client: openstack 3.7.0
+for i in $(openstack server list | awk '/ACTIVE/{ print $9 }'); do
+  nc -vzw 2 $i 22
+  ping -c 2 $i
 done

=== modified file 'tools/instance_start_all.sh'
--- tools/instance_start_all.sh	2015-04-02 03:52:38 +0000
+++ tools/instance_start_all.sh	2017-03-27 20:54:03 +0000
@@ -1,5 +1,2 @@
-#!/bin/bash
-
-echo " + Attempting to start all instances."
-
-for i in $(nova list | grep SHUT | awk '{ print $2 }');do echo $i; nova start $i; done
+#!/bin/bash -ex
+for i in $(openstack server list | awk '/SHUTOFF/{ print $2 }');do openstack server start $i; done

=== modified file 'tools/instance_stop_all.sh'
--- tools/instance_stop_all.sh	2015-04-02 03:52:38 +0000
+++ tools/instance_stop_all.sh	2017-03-27 20:54:03 +0000
@@ -1,5 +1,3 @@
-#!/bin/bash
-
-echo " + Attempting to stop all instances."
-
-for i in $(nova list | grep = | awk '{ print $2 }');do echo $i; nova stop $i; done
+#!/bin/bash -ex
+for i in $(openstack server list | awk '/ACTIVE/{ print $2 }');do openstack server stop $i; done
+