fix delete script

managed_clusters/delete.sh

@@ -7,32 +7,49 @@ SUBNET_CIDR="10.0.150.0/24"
 
 ###
 
+USE_OWN_ROUTER="false"
+
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
 
+if [[ ! -f ${DIR}/${NAME}_credentials.sh ]] || [[ ! -f ${DIR}/management_credentials.sh ]]; then
+  echo "Missing credentials. Stop script"
+  exit 1
+fi
+
 MANAGEMENT_PROJECT_ID=2092d29f72ca4f32ac416cc545986007
-MANAGEMENT_ROUTER_ID=90d2a94c-3bff-4a79-88d2-00dc6626e278
+MANAGEMENT_ROUTER_ID=0cb50dae-dcf9-4c40-8286-f14423a3d471
 MANAGEMENT_ROUTER_INTERNAL_ID=5e048465-53ed-4f24-8eec-871cf7d668d5
 MANAGEMENT_NETWORK_CIDR="10.0.1.0/24"
 MANAGEMENT_GATEWAY_INTERNAL="10.0.1.253"
 MANAGEMENT_SECGROUP_ID=7b7de2f9-a561-4f3c-929a-fd8bc26a0d2c
 
-source ${DIR}/credentials.sh
+source ${DIR}/${NAME}_credentials.sh
+
 
-USER_ROUTER_ID=$(openstack router show router -f value -c id)
 USER_NETWORK_ID=$(openstack network show $NAME -f value -c id)
 USER_SUBNET_ID=$(openstack network show $NAME -c subnets -f json | jq -r '.subnets[0]')
-
 openstack keypair delete ${NAME}
-rm ${DIR}/keypair.key
-USER_SEC_GROUP_ID=$(openstack security group create ${NAME} -c id -f value)
+rm ${DIR}/${NAME}/keypair.key
+USER_SEC_GROUP_ID=$(openstack security group show ${NAME} -c id -f value)
 openstack security group delete $USER_SEC_GROUP_ID
 
-source ${DIR}/../management_credentials.sh
-
+source ${DIR}/management_credentials.sh
+if [[ $USE_OWN_ROUTER == "true" ]]; then
+    USER_ROUTER_ID=$(openstack router show $NAME -f value -c id) 
     INTERNAL_ROUTER_PORT_ID=$(openstack port show -f value -c id ${NAME})
     INTERNAL_ROUTER_PORT_IP=$(openstack port show $INTERNAL_ROUTER_PORT_ID -f json -c fixed_ips | jq -r '.fixed_ips[0].ip_address')
     openstack router remove port $MANAGEMENT_ROUTER_INTERNAL_ID $INTERNAL_ROUTER_PORT_ID
     openstack router unset --route destination=$SUBNET_CIDR,gateway=$MANAGEMENT_GATEWAY_INTERNAL $MANAGEMENT_ROUTER_ID
+    openstack router unset --route destination=$MANAGEMENT_NETWORK_CIDR,gateway=$INTERNAL_ROUTER_PORT_IP $USER_ROUTER_ID
+    openstack router remove subnet $USER_ROUTER_ID $USER_SUBNET_ID
+else
+    MANAGEMENT_ROUTER_PORT_ID=$(openstack port list --device-owner network:router_interface --network ${USER_NETWORK_ID} -f value -c id)
+    openstack router remove port $MANAGEMENT_ROUTER_ID $MANAGEMENT_ROUTER_PORT_ID
+fi
+
+
+
+
 RULE_ID=$(openstack security group rule list -c ID -c 'IP Range' -c 'Port Range' -c 'IP Protocol' -f value $MANAGEMENT_SECGROUP_ID | grep "443:443" | grep tcp | grep "$SUBNET_CIDR" | cut -d' ' -f1)
 openstack security group rule delete $RULE_ID
 RULE_ID=$(openstack security group rule list -c ID -c 'IP Range' -c 'Port Range' -c 'IP Protocol' -f value $MANAGEMENT_SECGROUP_ID | grep "111:111" | grep tcp | grep "$SUBNET_CIDR" | cut -d' ' -f1)
@@ -44,10 +61,8 @@ openstack security group rule delete $RULE_ID
 RULE_ID=$(openstack security group rule list -c ID -c 'IP Range' -c 'Port Range' -c 'IP Protocol' -f value $MANAGEMENT_SECGROUP_ID | grep "2049:2049" | grep udp | grep "$SUBNET_CIDR" | cut -d' ' -f1)
 openstack security group rule delete $RULE_ID
 
-source ${DIR}/credentials.sh
+source ${DIR}/${NAME}_credentials.sh
 
-openstack router unset --route destination=$MANAGEMENT_NETWORK_CIDR,gateway=$INTERNAL_ROUTER_PORT_IP $USER_ROUTER_ID
-openstack router remove subnet $USER_ROUTER_ID $USER_SUBNET_ID
 openstack network delete $USER_NETWORK_ID
 
 echo "ssh Rancher-1"