summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTobias Henkel <tobias.henkel@bmw.de>2018-12-19 17:29:58 +0100
committerTobias Henkel <tobias.henkel@bmw.de>2018-12-19 20:23:37 +0000
commit52fe25da2551ef25d3f667b6f8f9adfe335dca07 (patch)
tree5d7863239228ba1228b1935cb2b91612d76c70ab
parent0d17a2527d41ec00923b184078f49d8458f039d6 (diff)
Add unmanaged vm to nodepool functional tests
In order to increase test coverage we should add an unmanaged vm to the functional tests. Change-Id: I3908c74ea6e581d61180e1b238e4d0e869751cf3 Depends-On: https://review.openstack.org/625923
Notes
Notes (review): Code-Review+2: Monty Taylor <mordred@inaugust.com> Code-Review+2: David Shrewsbury <shrewsbury.dave@gmail.com> Workflow+1: David Shrewsbury <shrewsbury.dave@gmail.com> Verified+2: Zuul Submitted-by: Zuul Submitted-at: Thu, 20 Dec 2018 15:32:37 +0000 Reviewed-on: https://review.openstack.org/626357 Project: openstack-infra/nodepool Branch: refs/heads/master
-rw-r--r--devstack/plugin.sh7
1 files changed, 7 insertions, 0 deletions
diff --git a/devstack/plugin.sh b/devstack/plugin.sh
index 8cacc8f..19cd0d5 100644
--- a/devstack/plugin.sh
+++ b/devstack/plugin.sh
@@ -691,6 +691,10 @@ function start_nodepool {
691 openstack --os-project-name demo --os-username demo security group rule create --ingress --protocol udp --dst-port 1:65535 --remote-ip 0.0.0.0/0 default 691 openstack --os-project-name demo --os-username demo security group rule create --ingress --protocol udp --dst-port 1:65535 --remote-ip 0.0.0.0/0 default
692 fi 692 fi
693 693
694 # start an unmanaged vm that should be ignored by nodepool
695 local cirros_image=$(openstack --os-project-name demo --os-username demo image list | grep cirros | awk '{print $4}' | head -n1)
696 openstack --os-project-name demo --os-username demo server create --flavor cirros256 --image $cirros_image unmanaged-vm
697
694 # create root keypair to use with glean for devstack cloud. 698 # create root keypair to use with glean for devstack cloud.
695 nova --os-project-name demo --os-username demo \ 699 nova --os-project-name demo --os-username demo \
696 keypair-add --pub-key $NODEPOOL_PUBKEY $NODEPOOL_KEY_NAME 700 keypair-add --pub-key $NODEPOOL_PUBKEY $NODEPOOL_KEY_NAME
@@ -715,6 +719,9 @@ function start_nodepool {
715 719
716function shutdown_nodepool { 720function shutdown_nodepool {
717 stop_process nodepool 721 stop_process nodepool
722
723 # Verify that the unmanaged vm still exists
724 openstack --os-project-name demo --os-username demo server show unmanaged-vm
718 : 725 :
719} 726}
720 727