summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.openstack.org>2018-12-20 15:32:37 +0000
committerGerrit Code Review <review@openstack.org>2018-12-20 15:32:37 +0000
commit89c7c6f80afac0fca3ffd8d12550ca956baad58c (patch)
tree84e31363d8214ccf54fe93928d4c8bdb1e2bd5a8
parent610699255805f6fb9cee515f10e63d32b2bdf750 (diff)
parent52fe25da2551ef25d3f667b6f8f9adfe335dca07 (diff)
Merge "Add unmanaged vm to nodepool functional tests"
-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