Handle the case with AppCreds, no project_id needed there.

Signed-off-by: Kurt Garloff <kurt@garloff.de>

Author: garloff

04-cloud-secret.sh

@@ -37,7 +37,7 @@ if test -n "$SECRETS"; then
 fi
 # Determine whether we need to add project ID
 RAW_CLOUD=$(extract_yaml clouds.$OS_CLOUD <$CLOUDS_YAML)
-if ! echo "$RAW_CLOUD" | grep -q "^\s*project_id:"; then
+if ! echo "$RAW_CLOUD" | grep -q '^\s*project_id:' && echo "$RAW_CLOUD" | grep -q '^\s*project_name:'; then
 	# Need openstack CLI for this
 	PROJECT_NAME=$(echo "$RAW_CLOUD" | grep '^\s*project_name:' | sed 's/^\s*project_name: //')
 	PROJECT_ID=$(openstack project show $PROJECT_NAME -c id -f value | tr -d '\r')

06-wait-clusterclass.sh

@@ -15,6 +15,7 @@ source "$SET"
 # ToDo: Wait for cluster class
 echo "The clusterclass should exist now"
 echo "WARN: Waiting not yet implemented"
+sleep 3
 set -x
-kubectl get clusterclasses -n "$CS_NAMESPACE"
 kubectl get images -n "$CS_NAMESPACE"
+kubectl get clusterclasses -n "$CS_NAMESPACE"

08-wait-cluster.sh

@@ -16,4 +16,4 @@ echo "The cluster should exist now"
 echo "WARN: Waiting not yet implemented"
 set -x
 clusterctl describe cluster -n "$CS_NAMESPACE" $CL_NAME
-echo clusterctl get kubeconfig -n "$CS_NAMESPACE" $CL_NAME > "~/.kube/$CS_NAMESPACE.$CL_NAME.yaml"
+echo "clusterctl get kubeconfig -n $CS_NAMESPACE $CL_NAME > ~/.kube/config-$CS_NAMESPACE.$CL_NAME"