openstack
/
grenade
Code Issues Proposed changes

Merge "use osc for security group manipulation"

This commit is contained in:
Jenkins 2017-04-07 15:03:23 +00:00 committed by Gerrit Code Review
parent 11dd94308e dbee4eed16
commit 95b2530985
2 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
projects/60_nova/resources.sh
View File

@ -66,12 +66,9 @@ function create {
# setup a working security group
# BUG(sdague): I have no idea how to make openstack security group work
# openstack security group create --description "BUG" $NOVA_USER
# openstack security group rule create --proto icmp --dst-port 0 $NOVA_USER
# openstack security group rule create --proto tcp --dst-port 22 $NOVA_USER
nova secgroup-create $NOVA_USER "BUG: this should not be mandatory"
nova secgroup-add-rule $NOVA_USER icmp -1 -1 0.0.0.0/0
nova secgroup-add-rule $NOVA_USER tcp 22 22 0.0.0.0/0
openstack security group create --description " BUG: this should not be mandatory" $NOVA_USER
openstack security group rule create --proto icmp --dst-port 0 $NOVA_USER
openstack security group rule create --proto tcp --dst-port 22 $NOVA_USER
# BUG(sdague): openstack client server create fails on volume
# error by default.
@ -145,7 +142,7 @@ function destroy {
openstack floating ip delete $(resource_get nova nova_server_float)
openstack server delete --wait $NOVA_SERVER
nova secgroup-delete $NOVA_USER || /bin/true
openstack security group delete $NOVA_USER || /bin/true
# lastly, get rid of our user - done as admin
source_quiet $TOP_DIR/openrc admin admin

11
projects/70_cinder/resources.sh
View File

@ -88,12 +88,9 @@ function create {
# setup a working security group
# BUG(sdague): I have no idea how to make openstack security group work
# openstack security group create --description "BUG" $CINDER_USER
# openstack security group rule create --proto icmp --dst-port 0 $CINDER_USER
# openstack security group rule create --proto tcp --dst-port 22 $CINDER_USER
nova secgroup-create $CINDER_USER "BUG: this should not be mandatory"
nova secgroup-add-rule $CINDER_USER icmp -1 -1 0.0.0.0/0
nova secgroup-add-rule $CINDER_USER tcp 22 22 0.0.0.0/0
openstack security group create --description "BUG" $CINDER_USER
openstack security group rule create --proto icmp --dst-port 0 $CINDER_USER
openstack security group rule create --proto tcp --dst-port 22 $CINDER_USER
# create key pairs for access
openstack keypair create $CINDER_KEY > $CINDER_KEY_FILE
@ -208,7 +205,7 @@ function destroy {
openstack volume delete $CINDER_VOL
nova secgroup-delete $CINDER_USER
openstack security group delete $CINDER_USER
# lastly, get rid of our user - done as admin
source_quiet $TOP_DIR/openrc admin admin