remove envvar APPLIANCES_ENVIRONMENT_NAME

Author: sjpb

environments/.stackhpc/activate

@@ -1,8 +1,7 @@
 export APPLIANCES_ENVIRONMENT_ROOT=$(dirname $(realpath ${BASH_SOURCE[0]:-${(%):-%x}}))
 echo "Setting APPLIANCES_ENVIRONMENT_ROOT to $APPLIANCES_ENVIRONMENT_ROOT"
 
-APPLIANCES_ENVIRONMENT_NAME=$(basename $APPLIANCES_ENVIRONMENT_ROOT)
-export PS1="${APPLIANCES_ENVIRONMENT_NAME}/ ${PS1}"
+export PS1="$(basename $APPLIANCES_ENVIRONMENT_ROOT)/ ${PS1}"
 
 export APPLIANCES_REPO_ROOT=$(realpath "$APPLIANCES_ENVIRONMENT_ROOT/../..")
 echo "Setting APPLIANCES_REPO_ROOT to $APPLIANCES_REPO_ROOT"

environments/common/inventory/group_vars/all/defaults.yml

@@ -3,6 +3,7 @@
 ansible_user: rocky
 appliances_repository_root: "{{ lookup('env', 'APPLIANCES_REPO_ROOT') }}"
 appliances_environment_root: "{{ lookup('env', 'APPLIANCES_ENVIRONMENT_ROOT') }}"
+appliances_environment_name: "{{ appliances_environment_root | basename | regex_replace('\\W+', '') }}" # [a-zA-Z0-9_] only
 #appliances_state_dir: # define an absolute path here to use for persistent state: NB: This is defined as /var/lib/state in inventory by the default Terraform
 
 # Address(ip/dns) for internal communication between services. This is

environments/common/inventory/group_vars/all/openondemand.yml

@@ -178,7 +178,7 @@ openondemand_scrape_configs:
     - targets:
       - "{{ openondemand_address }}:9301"
       labels:
-        environment: "{{ lookup('env', 'APPLIANCES_ENVIRONMENT_NAME') }}"
+        environment: "{{ appliances_environment_name }}"
         service: "openondemand"
 
 openondemand_dashboard:

environments/skeleton/{{cookiecutter.environment}}/activate

@@ -1,8 +1,7 @@
 export APPLIANCES_ENVIRONMENT_ROOT=$(dirname $(realpath ${BASH_SOURCE[0]:-${(%):-%x}}))
 echo "Setting APPLIANCES_ENVIRONMENT_ROOT to $APPLIANCES_ENVIRONMENT_ROOT"
 
-APPLIANCES_ENVIRONMENT_NAME=$(basename $APPLIANCES_ENVIRONMENT_ROOT)
-export PS1="${APPLIANCES_ENVIRONMENT_NAME}/ ${PS1}"
+export PS1="$(basename $APPLIANCES_ENVIRONMENT_ROOT)/ ${PS1}"
 
 export APPLIANCES_REPO_ROOT=$(realpath "$APPLIANCES_ENVIRONMENT_ROOT/../..")
 echo "Setting APPLIANCES_REPO_ROOT to $APPLIANCES_REPO_ROOT"