Use CLUSTER_NAME to preserve cluster status

Author: flaper87

06_run_ocp.sh

@@ -2,10 +2,8 @@
 set -x
 set -e
 
-source ocp_install_env.sh
 source common.sh
-
-export OS_CLOUD=openshift
+source ocp_install_env.sh
 
 # check whether we already have a floating ip created
 FLOATING_IP=$(openstack floating ip list --format value | awk -F ' ' 'NR==1 {print $2}')
@@ -20,21 +18,21 @@ grep -qxF "$FLOATING_IP $API_ADDRESS" /etc/hosts || echo "$FLOATING_IP $API_ADDR
 grep -qxF "$FLOATING_IP $CONSOLE_ADDRESS" /etc/hosts || echo "$FLOATING_IP $CONSOLE_ADDRESS" | sudo tee -a /etc/hosts
 grep -qxF "$FLOATING_IP $AUTH_ADDRESS" /etc/hosts || echo "$FLOATING_IP $AUTH_ADDRESS" | sudo tee -a /etc/hosts
 
-if [ ! -d ocp ]; then
-    mkdir -p ocp
+if [ ! -d $CLUSTER_NAME ]; then
+    mkdir -p $CLUSTER_NAME
 fi
 
-if [ ! -f ocp/install-config.yaml ]; then
+if [ ! -f $CLUSTER_NAME/install-config.yaml ]; then
     export CLUSTER_ID=$(uuidgen --random)
-    cat > ocp/install-config.yaml << EOF
+    cat > $CLUSTER_NAME/install-config.yaml << EOF
 apiVersion: v1beta3
 baseDomain: ${BASE_DOMAIN}
 clusterID:  ${CLUSTER_ID}
 machines:
 - name:     master
-  replicas: 3
+  replicas: 2
 - name:     worker
-  replicas: 3
+  replicas: 1
 metadata:
   name: ${CLUSTER_NAME}
 networking:
@@ -59,4 +57,4 @@ EOF
 fi
 
 
-$GOPATH/src/github.com/openshift/installer/bin/openshift-install --log-level=debug ${1:-create} ${2:-cluster} --dir ocp
+$GOPATH/src/github.com/openshift/installer/bin/openshift-install --log-level=debug ${1:-create} ${2:-cluster} --dir $CLUSTER_NAME

expose_ocp_api.sh

@@ -10,10 +10,10 @@ set -ex
 source ocp_install_env.sh
 source common.sh
 
-LB_FLOATING_IP=$(openstack server show ostest-api -f value -c addresses | cut -d " " -f 2)
+LB_FLOATING_IP=$(openstack server show ${CLUSTER_NAME}-api -f value -c addresses | cut -d " " -f 2)
 
 echo "Attempting to expose cluster's API on floating IP: ${LB_FLOATING_IP}" | lolcat
 
 if ! grep -q ${LB_FLOATING_IP} /etc/hosts ; then
-    (echo "${LB_FLOATING_IP} api.ostest.shiftstack.com" && grep -v "api.ostest.shiftstack.com" /etc/hosts) | sudo tee /etc/hosts
+    (echo "${LB_FLOATING_IP} api.${CLUSTER_NAME}.shiftstack.com" && grep -v "api.${CLUSTER_NAME}.shiftstack.com" /etc/hosts) | sudo tee /etc/hosts
 fi

ocp_cleanup.sh

@@ -4,11 +4,11 @@ set -e
 
 source ocp_install_env.sh
 
-$GOPATH/src/github.com/openshift/installer/bin/openshift-install --log-level=debug --dir ocp destroy cluster
+$GOPATH/src/github.com/openshift/installer/bin/openshift-install --log-level=debug --dir $CLUSTER_NAME destroy cluster
 
 # clean /etc/hosts
 grep -qxF "$API_ADDRESS" /etc/hosts || sudo sed -i "/$API_ADDRESS/d" /etc/hosts
 grep -qxF "$CONSOLE_ADDRESS" /etc/hosts || sudo sed -i "/$CONSOLE_ADDRESS/d" /etc/hosts
 grep -qxF "$AUTH_ADDRESS" /etc/hosts || sudo sed -i "/$AUTH_ADDRESS/d" /etc/hosts
 
-rm -rf ocp/{auth,terraform.tfstate}
+rm -rf $CLUSTER_NAME/

ocp_install_env.sh

@@ -1,19 +1,25 @@
 eval "$(go env)"
 
-export OS_CLOUD=openshift
+if [ -z "$OS_CLOUD" ]; then
+    export OS_CLOUD=openshift
+fi
+
+if [ -z "$CLUSTER_NAME" ]; then
+    export CLUSTER_NAME=ostest
+fi
+
 export OPENSHIFT_INSTALL_DATA="$GOPATH/src/github.com/openshift/installer/data/data"
 export OPENSTACK_REGION=regionOne
 export OPENSTACK_IMAGE=rhcos
 export OPENSTACK_FLAVOR=m1.medium
 export BASE_DOMAIN=shiftstack.com
-export CLUSTER_NAME=ostest
 export OPENSTACK_EXTERNAL_NETWORK=public
 export PULL_SECRET='{"auths": { "quay.io": { "auth": "Y29yZW9zK3RlYzJfaWZidWdsa2VndmF0aXJyemlqZGMybnJ5ZzpWRVM0SVA0TjdSTjNROUUwMFA1Rk9NMjdSQUZNM1lIRjRYSzQ2UlJBTTFZQVdZWTdLOUFIQlM1OVBQVjhEVlla", "email": "" }}}'
 export SSH_PUB_KEY="`cat $HOME/.ssh/id_rsa.pub`"
 
 export API_ADDRESS="api.${CLUSTER_NAME}.shiftstack.com"
-export CONSOLE_ADDRESS="console-openshift-console.apps.shiftstack.com"
-export AUTH_ADDRESS="openshift-authentication-openshift-authentication.apps.ostest.shiftstack.com"
+export CONSOLE_ADDRESS="console-openshift-console.apps.${CLUSTER_NAME}.shiftstack.com"
+export AUTH_ADDRESS="openshift-authentication-openshift-authentication.apps.${CLUSTER_NAME}.shiftstack.com"
 
 # Not used by the installer.  Used by s.sh.
 export SSH_PRIV_KEY="$HOME/.ssh/id_rsa"