openstack/kolla-ansible
Code Issues Proposed changes

Merge "Fix security group creation"

Browse Source
This commit is contained in:
Jenkins 2017-01-30 14:43:21 +00:00 committed by Gerrit Code Review
commit b05e4e1ee2
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
tools/init-runonce
View File

@ -62,16 +62,21 @@ openstack router create demo-router
openstack router add subnet demo-router demo-subnet openstack router add subnet demo-router demo-subnet
openstack router set --external-gateway public1 demo-router openstack router set --external-gateway public1 demo-router
# Get admin user and tenant IDs
ADMIN_USER_ID=$(openstack user list | awk '/ admin / {print $2}')
ADMIN_PROJECT_ID=$(openstack project list | awk '/ admin / {print $2}')
ADMIN_SEC_GROUP=$(openstack security group list --project ${ADMIN_PROJECT_ID} | awk '/ default / {print $2}')
# Sec Group Config # Sec Group Config
openstack security group rule create --ingress --ethertype IPv4 \ openstack security group rule create --ingress --ethertype IPv4 \
--protocol icmp default --protocol icmp ${ADMIN_SEC_GROUP}
openstack security group rule create --ingress --ethertype IPv4 \ openstack security group rule create --ingress --ethertype IPv4 \
--protocol tcp --dst-port 22 default --protocol tcp --dst-port 22 ${ADMIN_SEC_GROUP}
# Open heat-cfn so it can run on a different host # Open heat-cfn so it can run on a different host
openstack security group rule create --ingress --ethertype IPv4 \ openstack security group rule create --ingress --ethertype IPv4 \
--protocol tcp --dst-port 8000 default --protocol tcp --dst-port 8000 ${ADMIN_SEC_GROUP}
openstack security group rule create --ingress --ethertype IPv4 \ openstack security group rule create --ingress --ethertype IPv4 \
--protocol tcp --dst-port 8080 default --protocol tcp --dst-port 8080 ${ADMIN_SEC_GROUP}
if [ ! -f ~/.ssh/id_rsa.pub ]; then if [ ! -f ~/.ssh/id_rsa.pub ]; then
echo Generating ssh key. echo Generating ssh key.
@ -84,10 +89,6 @@ fi
# Increase the quota to allow 40 m1.small instances to be created # Increase the quota to allow 40 m1.small instances to be created
# Get admin user and tenant IDs
ADMIN_USER_ID=$(openstack user list | awk '/ admin / {print $2}')
ADMIN_PROJECT_ID=$(openstack project list | awk '/ admin / {print $2}')
# 40 instances # 40 instances
openstack quota set --instances 40 $ADMIN_PROJECT_ID openstack quota set --instances 40 $ADMIN_PROJECT_ID