You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by ma...@apache.org on 2019/06/06 18:16:53 UTC

[airavata] branch master updated: updating inventory: stagingnew -> production

This is an automated email from the ASF dual-hosted git repository.

machristie pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/airavata.git


The following commit(s) were added to refs/heads/master by this push:
     new 8c31d03  updating inventory: stagingnew -> production
8c31d03 is described below

commit 8c31d035068a711e18e0e0b619f017296948a810
Author: Marcus Christie <ma...@iu.edu>
AuthorDate: Thu Jun 6 14:16:08 2019 -0400

    updating inventory: stagingnew -> production
---
 .../scigap/production/files/pga_config_0.17.php.j2 | 256 ------------------
 .../scigap/production/group_vars/all/vars.yml      |  52 +++-
 .../scigap/production/group_vars/all/vault.yml     |  65 ++---
 .../ansible/inventories/scigap/production/hosts    |  21 +-
 .../scigap/production/pga_config/Kentucky/vars.yml |   1 -
 .../production/pga_config/NCSAIndustry/vars.yml    |   1 -
 .../scigap/production/pga_config/accord/vars.yml   |  66 -----
 .../scigap/production/pga_config/accord/vault.yml  |  18 --
 .../production/pga_config/ampgateway/vars.yml      |   1 -
 .../scigap/production/pga_config/brandeis/vars.yml |  57 ----
 .../production/pga_config/brandeis/vault.yml       |  18 --
 .../scigap/production/pga_config/csbglsu/vars.yml  |   1 -
 .../scigap/production/pga_config/ddstudio/vars.yml |   1 -
 .../scigap/production/pga_config/demo1/vars.yml    |  65 -----
 .../scigap/production/pga_config/demo1/vault.yml   |  17 --
 .../scigap/production/pga_config/demo10/vars.yml   |  65 -----
 .../scigap/production/pga_config/demo10/vault.yml  |  17 --
 .../scigap/production/pga_config/demo2/vars.yml    |  65 -----
 .../scigap/production/pga_config/demo2/vault.yml   |  17 --
 .../scigap/production/pga_config/demo3/vars.yml    |  65 -----
 .../scigap/production/pga_config/demo3/vault.yml   |  17 --
 .../scigap/production/pga_config/demo4/vars.yml    |  65 -----
 .../scigap/production/pga_config/demo4/vault.yml   |  17 --
 .../scigap/production/pga_config/demo5/vars.yml    |  65 -----
 .../scigap/production/pga_config/demo5/vault.yml   |  17 --
 .../scigap/production/pga_config/demo6/vars.yml    |  65 -----
 .../scigap/production/pga_config/demo6/vault.yml   |  17 --
 .../scigap/production/pga_config/demo7/vars.yml    |  65 -----
 .../scigap/production/pga_config/demo7/vault.yml   |  17 --
 .../scigap/production/pga_config/demo8/vars.yml    |  65 -----
 .../scigap/production/pga_config/demo8/vault.yml   |  17 --
 .../scigap/production/pga_config/demo9/vars.yml    |  65 -----
 .../scigap/production/pga_config/demo9/vault.yml   |  17 --
 .../production/pga_config/distantreader/vars.yml   |   3 +-
 .../production/pga_config/epwgateway/vars.yml      |  12 +-
 .../scigap/production/pga_config/gatech/vars.yml   |   9 +-
 .../production/pga_config/georgiastate/vars.yml    |   1 -
 .../scigap/production/pga_config/hubzero/vars.yml  |   1 -
 .../production/pga_config/interactwel/vars.yml     |  11 +-
 .../production/pga_config/iugateway/vars.yml       |   1 -
 .../production/pga_config/iugeosurvey/vars.yml     |   1 -
 .../scigap/production/pga_config/lsu/vars.yml      |   1 -
 .../scigap/production/pga_config/mines/vars.yml    |   1 -
 .../production/pga_config/nanoconfinement/vars.yml |   1 -
 .../production/pga_config/nanoshape/vars.yml       |   1 -
 .../production/pga_config/newmexicostate/vars.yml  |   1 -
 .../scigap/production/pga_config/nexttdb/vars.yml  |   1 -
 .../scigap/production/pga_config/nsg/vars.yml      |  63 -----
 .../scigap/production/pga_config/nsg/vault.yml     |  18 --
 .../scigap/production/pga_config/oiitandy/vars.yml |  65 -----
 .../production/pga_config/oiitandy/vault.yml       |  18 --
 .../scigap/production/pga_config/oscer/vars.yml    |   1 -
 .../production/pga_config/pfec-hydro/vars.yml      |   1 -
 .../scigap/production/pga_config/phasta/vars.yml   |   7 +-
 .../scigap/production/pga_config/r-hpc/vars.yml    |   1 -
 .../production/pga_config/rutgersgemr/vars.yml     |   1 -
 .../scigap/production/pga_config/saverx/vars.yml   |   1 -
 .../scigap/production/pga_config/scigap/vars.yml   |   1 -
 .../scigap/production/pga_config/sdstate/vars.yml  |   1 -
 .../scigap/production/pga_config/seagrid/vars.yml  |   1 -
 .../production/pga_config/searchingSRA/vars.yml    |   1 -
 .../production/pga_config/simvascular/vars.yml     |   1 -
 .../production/pga_config/southdakota/vars.yml     |   1 -
 .../pga_config/southernillinois/vars.yml           |   1 -
 .../production/pga_config/testdrive/vars.yml       |   1 -
 .../scigap/production/pga_config/uab/vars.yml      |   1 -
 .../production/pga_config/ultrascan/vars.yml       |   7 +-
 .../scigap/production/pga_config/utah/vars.yml     |  65 -----
 .../scigap/production/pga_config/utah/vault.yml    |  18 --
 .../scigap/production/pga_config/wvsu/vars.yml     |   1 -
 .../scigap/stagingnew/files/airavata.jks           |  76 ------
 .../scigap/stagingnew/files/airavata_sym.jks       |  30 ---
 .../scigap/stagingnew/files/client_truststore.jks  | 271 -------------------
 .../scigap/stagingnew/files/keycloak.jks           | 143 ----------
 .../scigap/stagingnew/group_vars/all/vars.yml      | 166 ------------
 .../scigap/stagingnew/group_vars/all/vault.yml     |  35 ---
 .../ansible/inventories/scigap/stagingnew/hosts    |  26 --
 .../stagingnew/pga_config/NCSAIndustry/vars.yml    |  64 -----
 .../stagingnew/pga_config/NCSAIndustry/vault.yml   |  18 --
 .../stagingnew/pga_config/ampgateway/vars.yml      |  65 -----
 .../stagingnew/pga_config/ampgateway/vault.yml     |  18 --
 .../scigap/stagingnew/pga_config/csbglsu/vars.yml  |  62 -----
 .../scigap/stagingnew/pga_config/csbglsu/vault.yml |  18 --
 .../scigap/stagingnew/pga_config/ddstudio/vars.yml |  65 -----
 .../stagingnew/pga_config/ddstudio/vault.yml       |  17 --
 .../stagingnew/pga_config/distantreader/vars.yml   |  66 -----
 .../stagingnew/pga_config/distantreader/vault.yml  |  18 --
 .../stagingnew/pga_config/epwgateway/vars.yml      |  64 -----
 .../stagingnew/pga_config/epwgateway/vault.yml     |  18 --
 .../scigap/stagingnew/pga_config/gatech/vars.yml   |  60 -----
 .../scigap/stagingnew/pga_config/gatech/vault.yml  |  18 --
 .../stagingnew/pga_config/georgiastate/vars.yml    |  64 -----
 .../stagingnew/pga_config/georgiastate/vault.yml   |  18 --
 .../scigap/stagingnew/pga_config/hubzero/vars.yml  |  64 -----
 .../scigap/stagingnew/pga_config/hubzero/vault.yml |  18 --
 .../stagingnew/pga_config/interactwel/vars.yml     |  64 -----
 .../stagingnew/pga_config/interactwel/vault.yml    |  18 --
 .../stagingnew/pga_config/iugateway/vars.yml       |  65 -----
 .../stagingnew/pga_config/iugateway/vault.yml      |  18 --
 .../stagingnew/pga_config/iugeosurvey/vars.yml     |  66 -----
 .../stagingnew/pga_config/iugeosurvey/vault.yml    |  18 --
 .../scigap/stagingnew/pga_config/kentucky/vars.yml |  64 -----
 .../stagingnew/pga_config/kentucky/vault.yml       |  18 --
 .../scigap/stagingnew/pga_config/lsu/vars.yml      |  56 ----
 .../scigap/stagingnew/pga_config/lsu/vault.yml     |  18 --
 .../scigap/stagingnew/pga_config/mines/vars.yml    |  65 -----
 .../scigap/stagingnew/pga_config/mines/vault.yml   |  18 --
 .../stagingnew/pga_config/nanoconfinement/vars.yml |  64 -----
 .../pga_config/nanoconfinement/vault.yml           |  17 --
 .../stagingnew/pga_config/nanoshape/vars.yml       |  64 -----
 .../stagingnew/pga_config/nanoshape/vault.yml      |  18 --
 .../stagingnew/pga_config/newmexicostate/vars.yml  |  64 -----
 .../stagingnew/pga_config/newmexicostate/vault.yml |  18 --
 .../scigap/stagingnew/pga_config/nexttdb/vars.yml  |  65 -----
 .../scigap/stagingnew/pga_config/nexttdb/vault.yml |  18 --
 .../scigap/stagingnew/pga_config/oscer/vars.yml    |  64 -----
 .../scigap/stagingnew/pga_config/oscer/vault.yml   |  17 --
 .../stagingnew/pga_config/pfec-hydro/vars.yml      |  68 -----
 .../stagingnew/pga_config/pfec-hydro/vault.yml     |  18 --
 .../scigap/stagingnew/pga_config/phasta/vars.yml   |  64 -----
 .../scigap/stagingnew/pga_config/phasta/vault.yml  |  18 --
 .../scigap/stagingnew/pga_config/r-hpc/vars.yml    |  64 -----
 .../scigap/stagingnew/pga_config/r-hpc/vault.yml   |  18 --
 .../stagingnew/pga_config/rutgersgemr/vars.yml     |  64 -----
 .../stagingnew/pga_config/rutgersgemr/vault.yml    |  18 --
 .../scigap/stagingnew/pga_config/saverx/vars.yml   |  67 -----
 .../scigap/stagingnew/pga_config/saverx/vault.yml  |  18 --
 .../scigap/stagingnew/pga_config/scigap/vars.yml   |  71 -----
 .../scigap/stagingnew/pga_config/scigap/vault.yml  |  18 --
 .../scigap/stagingnew/pga_config/sdstate/vars.yml  |  65 -----
 .../scigap/stagingnew/pga_config/sdstate/vault.yml |  18 --
 .../scigap/stagingnew/pga_config/seagrid/vars.yml  |  76 ------
 .../scigap/stagingnew/pga_config/seagrid/vault.yml |  18 --
 .../stagingnew/pga_config/searchingSRA/vars.yml    |  68 -----
 .../stagingnew/pga_config/searchingSRA/vault.yml   |  18 --
 .../pga_config/simvascular/files/pga_config.php.j2 | 295 ---------------------
 .../stagingnew/pga_config/simvascular/vars.yml     |  71 -----
 .../stagingnew/pga_config/simvascular/vault.yml    |  18 --
 .../stagingnew/pga_config/southdakota/vars.yml     |  65 -----
 .../stagingnew/pga_config/southdakota/vault.yml    |  17 --
 .../pga_config/southernillinois/vars.yml           |  65 -----
 .../pga_config/southernillinois/vault.yml          |  18 --
 .../stagingnew/pga_config/testdrive/vars.yml       |  66 -----
 .../stagingnew/pga_config/testdrive/vault.yml      |  18 --
 .../scigap/stagingnew/pga_config/uab/vars.yml      |  64 -----
 .../scigap/stagingnew/pga_config/uab/vault.yml     |  18 --
 .../stagingnew/pga_config/ultrascan/vars.yml       |  66 -----
 .../stagingnew/pga_config/ultrascan/vault.yml      |  18 --
 .../scigap/stagingnew/pga_config/wvsu/vars.yml     |  70 -----
 .../scigap/stagingnew/pga_config/wvsu/vault.yml    |  18 --
 150 files changed, 104 insertions(+), 5630 deletions(-)

diff --git a/dev-tools/ansible/inventories/scigap/production/files/pga_config_0.17.php.j2 b/dev-tools/ansible/inventories/scigap/production/files/pga_config_0.17.php.j2
deleted file mode 100644
index af887be..0000000
--- a/dev-tools/ansible/inventories/scigap/production/files/pga_config_0.17.php.j2
+++ /dev/null
@@ -1,256 +0,0 @@
-<?php
-return array(
-    /**
-     * *****************************************************************
-     *  WSO2 Identity Server Related Configurations
-     * *****************************************************************
-     */
-
-    'wsis' => [
-
-        /**
-         * Admin Role Name
-         */
-        'admin-role-name' => '{{ admin_role_name }}',
-
-        /**
-         * Read only Admin Role Name
-         */
-        'read-only-admin-role-name' => '{{ admin_readonly_role_name }}',
-
-        /**
-         * Gateway user role
-         */
-        'user-role-name' => '{{ user_role_name }}',
-
-        /**
-         * Initial user role. This is the initial user role assigned to a new
-         * user. Set this to one of the three roles above to automatically
-         * grant new users that role, or set to some other role ('user-pending')
-         * to require admin approval before users have access.
-         */
-        'initial-role-name' => '{{ initial_role_name }}',
-
-        /**
-         * Tenant Domain
-         */
-        'tenant-domain' => '{{ tenant_domain }}',
-
-        /**
-         * Tenant admin's username
-         */
-        'admin-username' => '{{ admin_username }}',
-
-        /**
-         * Tenant admin's password
-         */
-        'admin-password' => '{{ admin_password }}',
-
-        /**
-         * OAuth client key
-         */
-        'oauth-client-key' => '{{ oauth_client_key }}',
-
-        /**
-         * OAuth client secret
-         */
-        'oauth-client-secret' => '{{ oauth_client_secret }}',
-
-        /**
-         * OAuth Grant Type (password or authorization_code)
-         */
-        'oauth-grant-type' => 'password',
-
-        /**
-         * Identity server domain
-         */
-        'server' => 'idp.scigap.org',
-
-        /**
-         * Identity server url
-         */
-        'service-url' => 'https://idp.scigap.org:9443/',
-
-        /**
-         * Enable HTTPS server verification
-         */
-        'verify-peer' => {{ auth_verify_peer }},
-
-        /**
-         * Path to the server certificate file
-         */
-        'cafile-path' => app_path() . '/resources/security/idp_scigap_org.pem',
-
-        /**
-         * Allow self signed server certificates
-         */
-        'allow-self-signed-cert' => false
-    ],
-
-
-    /**
-     * *****************************************************************
-     *  Airavata Client Configurations
-     * *****************************************************************
-     */
-    'airavata' => [
-
-        /**
-         * Airavata API server location. Use tls:// as the protocol to
-         * connect TLS enabled Airavata
-         */
-        'airavata-server' => '{{ airavata_server }}',
-
-        /**
-         * Airavata API server port
-         */
-        'airavata-port' => '{{ airavata_port }}',
-
-        /**
-         * Airavata API server thrift communication timeout
-         */
-        'airavata-timeout' => '1000000',
-
-        /**
-         * PGA Gateway ID
-         */
-        'gateway-id' => '{{ gateway_id }}',
-
-        /**
-         * Maximum size of a file which is allowed to upload to the server
-         */
-        'server-allowed-file-size' => 64,
-
-        /**
-         * absolute path of the data dir
-         */
-        'experiment-data-absolute-path' => '{{ experiment_data_dir }}',
-
-        /**
-         * Advanced experiments options
-         */
-        'advanced-experiment-options' => '',
-
-        /**
-         * Default queue name
-         */
-        'queue-name' => 'long',
-
-        /**
-         * Default node count
-         */
-        'node-count' => '1',
-
-        /**
-         * Default total core count
-         */
-        'total-cpu-count' => '16',
-
-        /**
-         * Default wall time limit
-         */
-        'wall-time-limit' => '30',
-
-        /**
-         * Enable app-catalog cache
-         */
-        'enable-app-catalog-cache' => true,
-
-        /**
-         * Life time of app catalog data cache in minutes
-         */
-        'app-catalog-cache-duration' => 5,
-
-         /**
-         * Gateway data store resource id
-         */
-         'gateway-data-store-resource-id' => '{{ gateway_data_store_resource_id }}',
-
-         /**
-          * Data Sharing enabled
-          */
-          'data-sharing-enabled' => {{ data_sharing_enabled }}
-    ],
-
-    /**
-     * *****************************************************************
-     *  Portal Related Configurations
-     * *****************************************************************
-     */
-    'portal' => [
-        /**
-         * Whether this portal is the SciGaP admin portal
-         */
-        'super-admin-portal' => {{ super_admin_portal }},
-
-        /**
-         * Set the name of theme in use here
-         */
-        'theme' => '{{ portal_theme }}',
-
-        /**
-         * Portal title
-         */
-        'portal-title' => '{{ portal_title }}',
-
-        /**
-         * Email address of the portal admin. Portal admin well get email notifications for events
-         * such as new user creation
-         */
-        'admin-emails' => {{ admin_emails }},
-
-        /**
-         * Email account that the portal should login to send emails
-         */
-        'portal-email-username' => '{{ portal_email_username }}',
-
-        /**
-         * Password for the portal's email account
-         */
-        'portal-email-password' => '{{ portal_email_password }}',
-
-        /**
-         * SMTP server on which the portal should connect
-         */
-        'portal-smtp-server-host' => 'smtp.gmail.com',
-
-        /**
-         * SMTP server port on which the portal should connect
-         */
-        'portal-smtp-server-port' => '587',
-
-        /**
-         * Set JIRA Issue Collector scripts here.
-         */
-        'jira-help' =>
-        [
-            /**
-             * Report Issue Script issued for your app by Atlassian JIRA
-             */
-            'report-issue-script' => '',
-            /**
-             * Collector id at the end of the above script
-             */
-            'report-issue-collector-id' => '',
-            /**
-             * Create Report Script issued for your app by Atlassian JIRA
-             */
-            'request-feature-script' => '',
-            /**
-             * Collector id at the end of the above script
-             */
-            'request-feature-collector-id' => ''
-        ],
-
-        /**
-         * Set Google Analytics Id here. ID format that generates from
-         * creating tracker object should be
-         *
-         * UA-XXXXX-Y
-         *
-         * for it to be working correctly. Currently it is only set for
-         * sending pageviews.
-         */
-        'google-analytics-id' => ''
-    ]
-);
diff --git a/dev-tools/ansible/inventories/scigap/production/group_vars/all/vars.yml b/dev-tools/ansible/inventories/scigap/production/group_vars/all/vars.yml
index 953cb1e..5647467 100644
--- a/dev-tools/ansible/inventories/scigap/production/group_vars/all/vars.yml
+++ b/dev-tools/ansible/inventories/scigap/production/group_vars/all/vars.yml
@@ -20,7 +20,7 @@
 
 ---
 ansible_connection: ssh
-ansible_user: root
+ansible_user: centos
 
 user: airavata
 group: airavata
@@ -30,13 +30,12 @@ user_home: "/home/{{ user }}"
 deployment_dir: "{{ user_home }}/master-deployment"
 airavata_source_dir: "{{ user_home }}/master-source"
 airavata_repo: "https://github.com/apache/airavata.git"
-airavata_dist: "apache-airavata-server-0.17-SNAPSHOT"
+airavata_dist: "apache-airavata-api-server-0.18-SNAPSHOT"
 airavata_dist_name: "{{ airavata_dist }}-bin.tar.gz"
-old_airavata_dist: "apache-airavata-server-0.17-SNAPSHOT"
 git_branch: master
 
 # Database related variables
-db_server: "{{ groups['database'][0] }}"
+db_server: "{{ hostvars[groups['database'][0]]['ansible_default_ipv4']['address'] }}"
 db_server_port: "3306"
 db_user: "airavata"
 db_password: "{{ vault_db_password }}"
@@ -49,8 +48,6 @@ workflow_catalog: "workflow_catalog"
 credential_store: "credential_store"
 profile_service: "profile_service"
 
-mysql_connector_jar: "mysql-connector-java-5.1.37-bin.jar"
-
 # Rabbitmq related vareables
 rabbitmq_server: "{{ groups['rabbitmq'][0] }}"
 rabbitmq_vhost: "master"
@@ -101,23 +98,16 @@ cred_store_server_host: "{{ groups['api-orch'][0] }}"
 cred_store_port: "8960"
 keystores_location: "{{ deployment_dir }}/keystores"
 
-# Gfac related variables
-gfac_name: "gfac-node0"
-gfac_host: "{{ groups['gfac'][0] }}"
-gfac_port: "8950"
-gfac_dir: "{{ deployment_dir }}/gfac-instance"
-gfac_log_dir: "{{ gfac_dir }}/logs"
-
 # Monitoring variables
 monitor_email_address: "scigap03jobs@scigap.org"
 monitor_email_password: "{{ vault_monitor_email_password }}"
 
 # PGA variables
 pga_repo: "https://github.com/apache/airavata-php-gateway.git"
+pga_git_branch: "master"
 user_data_dir: "/var/www/portals/gateway-user-data"
 real_user_data_dir: "/data/gateway-user-data"
 ## Airavata Client related variables
-#airavata_server: "tls://gw77.iu.xsede.org"
 airavata_server: "tls://{{ groups['api-orch'][0] }}"
 airavata_port: "9930"
 airavata_profile_service_server: "{{ groups['api-orch'][0] }}"
@@ -140,3 +130,37 @@ keycloak_db_username: "keycloak"
 keycloak_db_password: "{{ vault_keycloak_db_password }}"
 keycloak_master_account_username: "AiravataAdmin"
 keycloak_master_account_password: "{{ vault_keycloak_master_account_password }}"
+
+# Helix
+helix_version: 0.7.1
+helix_url: http://www-us.apache.org/dist//helix/{{helix_version}}/binaries/helix-core-{{helix_version}}-pkg.tar
+helix_dir: "{{ deployment_dir }}/airavata-helix"
+helix_cluster_name: "AiravataDemoCluster"
+snapshot_version: "0.18-SNAPSHOT"
+helix_controller_name: "helixcontroller"
+helix_participant_name: "helixparticipant"
+helix_pre_wm_name: "prewm"
+helix_pre_wm_load_balance_clusters: "false"
+helix_post_wm_name: "postwm"
+helix_post_wm_load_balance_clusters: "false"
+
+# Listening port for kafka installations
+kafka_listener_port: 9092
+kafka_rest_proxy_listener_port: 8082
+
+# Realtime Monitoring related variables
+realtime_monitor_broker_url: "{{ groups['kafka'][0] }}:{{ kafka_listener_port }}"
+realtime_monitor_broker_publisher: "RealtimeProducer"
+realtime_monitor_broker_consumer_group: "monitor"
+realtime_monitor_broker_topic: "helix-airavata-mq"
+
+# Variables related to the broker in which parsed job statuses are published
+job_monitor_broker_url: "{{ groups['kafka'][0] }}:{{ kafka_listener_port }}"
+job_monitor_broker_topic: "parsed-data"
+job_monitor_broker_consumer_group: "MonitoringConsumer"
+
+# Variables related to platform monitor
+platform_name: "Staging Environment"
+platform_monitor_email_address: "airavataplatformmonitor@gmail.com"
+platform_monitor_email_password: "{{ vault_platform_monitor_email_password }}"
+platform_monitor_target_email_addresses: "dimuthu.upeksha2@gmail.com,dwannipu@iu.edu"
diff --git a/dev-tools/ansible/inventories/scigap/production/group_vars/all/vault.yml b/dev-tools/ansible/inventories/scigap/production/group_vars/all/vault.yml
index e5d7671..4efff11 100644
--- a/dev-tools/ansible/inventories/scigap/production/group_vars/all/vault.yml
+++ b/dev-tools/ansible/inventories/scigap/production/group_vars/all/vault.yml
@@ -1,32 +1,35 @@
 $ANSIBLE_VAULT;1.1;AES256
-36656438643034386437333735643963306462343964333131646432353464333663656462623261
-6537633832376334666261346438346466363263373135390a313962303637396532366231376336
-65636236353137383061636664386133363838316230376664333265633564343633653333623736
-6536363430653439650a633431393961333438363462356434333735646566353263366565336533
-31633462353766356562616236363964656265363537636166613931366130303135386330383939
-65613230363762326164643432323661636639653763373130373433356666323466353361333338
-61336331646139323033613037643839353430343737363234386233353936646264386538396164
-63303435373266653137383238356136333962323130663766616465313537663333663130653066
-64313838623634643632323862316437333764366364656266353232643036393262363130616465
-33383465383838643561653035336563383366623737336235336266393134636332666561356536
-39623961613966333130613936656332353331653863363138666338363064633130343936393134
-65613132653934313632626261316663646266636237666437613739383965653531343862313538
-66313130613862623435666665393363383638313962633938353064386633346266623264373561
-66336430323361366131613163323861373563656133323335636237306332356637353766636164
-37343639346533616462303234303930343938323537346537663938336531623034373335313061
-65376636653834626364356536383666333337656163323235613332396638636365643363666239
-64333434656130646533306330626635313132633536616363333139643866396136373132646239
-65386232353139366338356130653831623539393263343137313739643430616566363232366661
-66383731393931326432636231366434343364336264643436633639373134373565643466663933
-39383835363635623461313365666562383365313339363766313638656238623139363833643638
-66653732613035303365646137643333653061643263396266396639626633386536663462373663
-64633331383161313337343063373461623534373630353239633930366165633931663462303234
-62666662393234633034313732646436326562336637336136623766616634386439313937346363
-66613730376531663833646133633736326633656538383966326232336633316662313235653063
-61386365353266613665333935343165356263663164383635313632613935636333386538303934
-61323733636263623439656339316139313163376565363032353236313738626261643064316364
-38643937323136386233303566376462663836626538386261356333323637353861613836666663
-34396137636561333738663035653939656230633838343766343432366466383537653334326462
-33366431346465333562306164353934316261643330376565336364373231363335303733653439
-37376639326335323137306161366439333465393432396638343837343930313635333433346263
-306562646366333162653131396234633362
+32326532653963626434326231373439623237396363643165653230356533386166373431313939
+3131616564656133373730353234616439613730643766620a323637666366313063643333363438
+64303438393332666538383963626539393062386438646363656533323434346538376161363665
+3831356362343964300a343561663930363535366562313337663331376339306132323762383737
+39646638303462383862303366626134333330623938616231363538353837333231336162396134
+35656237313762363331643936376533313236393561333463636261373332343961646162663930
+38333965653535346262383936656361643364346632376439636261396131393531643861393561
+31303434333036636637303162343833336338326239623134646133666337333433313632643438
+62373733346437393334376235343933626162303631393037376638373566633734643333303265
+39333636626338633033626663663337643831666135316461663639613634303738613235646336
+37663766663636666630383236356335303137626633393934323537666261613662623534366464
+38333166613335653838393530636636303564313334326463363532623834323733613433316363
+64303762653330643037363433326639323561313539653930363538616331323961626231663836
+39366335666364623133313933636636366433303036653263383463303034333965373965636531
+36383438396563303938326438323431343835373935613162323766653437353664656566613665
+65373364636230376162333732346634613861356638646634323538316535396539333533303438
+32333364336561396365333365623936613963373932313735363738386430353263663434656339
+33366534376535346538633961623935663634393334316463313531346565363333316439353237
+64306161613339393037316361323362613431613761326266316135613732363831613031386235
+36346233643431636165336536306234393538616263636561626665343139303266353861393639
+35343462326563343533643564623765616537666466613935643166653831356565373762313265
+66363433306432343165643565393062333135343264666538356166653263353163313535643262
+30636566383730383935323434613338623964323733643435366333646430626337643165306235
+38613038333339376335623161373034666564623763643563323935333337343334346566626264
+32356232383933346266313232363164346333313130636566313631333234333762303835363663
+65646435333834363063343635316332623332336331643263386363633361643432616563346665
+35643231653635366661383630303965356364653634616534373165646434363331636165373863
+64636234323265623139313931613739663765326434633539613839343236333262393135656432
+39363465333339363738306665323562376338303230343032663334656439643064366430633134
+32333436363536336465386561626236643036353239306634313663343831393765313637393362
+39643332336562333639646631626633323437616630323832383661666537303461646563396663
+39346235376432303334393536313061333161656232343466386632303037386362306332663934
+66613230633064313834333538313565616534623130353766326661346338353233646162623963
+3238303031303061636337343034633335333439666165653433
diff --git a/dev-tools/ansible/inventories/scigap/production/hosts b/dev-tools/ansible/inventories/scigap/production/hosts
index 2070472..9321659 100644
--- a/dev-tools/ansible/inventories/scigap/production/hosts
+++ b/dev-tools/ansible/inventories/scigap/production/hosts
@@ -1,24 +1,25 @@
----
 # inventory file : scigap production deployment
 
 [zookeeper]
-scigap02.sciencegateways.iu.edu
+scigap07.sciencegateways.iu.edu ansible_user=root
 
 [rabbitmq]
-scigap02.sciencegateways.iu.edu
+scigap06.sciencegateways.iu.edu ansible_user=root
 
 [database]
-scigap01.sciencegateways.iu.edu
+scigap05.sciencegateways.iu.edu ansible_user=root
 
 [api-orch]
-scigap02.sciencegateways.iu.edu
+scigap06.sciencegateways.iu.edu ansible_user=root
 
-[gfac]
-scigap03.sciencegateways.iu.edu
+[helix]
+scigap07.sciencegateways.iu.edu ansible_user=root
+
+[kafka]
+scigap07.sciencegateways.iu.edu ansible_user=root
 
 [pga]
-#scigap04.sciencegateways.iu.edu
-gf4.ucs.indiana.edu
+gf4.ucs.indiana.edu ansible_user=root
 
 [keycloak]
-gf7.ucs.indiana.edu
+gf7.ucs.indiana.edu ansible_user=root
diff --git a/dev-tools/ansible/inventories/scigap/production/pga_config/Kentucky/vars.yml b/dev-tools/ansible/inventories/scigap/production/pga_config/Kentucky/vars.yml
index 1bd8dcb..8de262a 100644
--- a/dev-tools/ansible/inventories/scigap/production/pga_config/Kentucky/vars.yml
+++ b/dev-tools/ansible/inventories/scigap/production/pga_config/Kentucky/vars.yml
@@ -20,7 +20,6 @@
 
 ---
 pga_repo: "https://github.com/apache/airavata-php-gateway.git"
-git_branch: "master"
 user: "pga"
 group: "pga"
 doc_root_dir: "/var/www/portals/{{ gateway_id }}"
diff --git a/dev-tools/ansible/inventories/scigap/production/pga_config/NCSAIndustry/vars.yml b/dev-tools/ansible/inventories/scigap/production/pga_config/NCSAIndustry/vars.yml
index cbd2be2..ea1e034 100644
--- a/dev-tools/ansible/inventories/scigap/production/pga_config/NCSAIndustry/vars.yml
+++ b/dev-tools/ansible/inventories/scigap/production/pga_config/NCSAIndustry/vars.yml
@@ -20,7 +20,6 @@
 
 ---
 pga_repo: "https://github.com/apache/airavata-php-gateway.git"
-git_branch: "master"
 user: "pga"
 group: "pga"
 doc_root_dir: "/var/www/portals/{{ gateway_id }}"
diff --git a/dev-tools/ansible/inventories/scigap/production/pga_config/accord/vars.yml b/dev-tools/ansible/inventories/scigap/production/pga_config/accord/vars.yml
deleted file mode 100644
index 0544aaf..0000000
--- a/dev-tools/ansible/inventories/scigap/production/pga_config/accord/vars.yml
+++ /dev/null
@@ -1,66 +0,0 @@
-#
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
----
-pga_repo: "https://github.com/apache/airavata-php-gateway.git"
-git_branch: "master"
-user: "pga"
-group: "pga"
-doc_root_dir: "/var/www/portals/accord"
-vhost_servername: "accord.hpc.virginia.edu"
-vhost_serveralias: "www.accord.hpc.virginia.edu"
-vhost_ssl: True
-# TODO: have Ansible manage these files as well
-ssl_certificate_file: "/etc/letsencrypt/live/accord.hpc.virginia.edu/cert.pem"
-ssl_certificate_chain_file: "/etc/letsencrypt/live/accord.hpc.virginia.edu/fullchain.pem"
-ssl_certificate_key_file: "/etc/letsencrypt/live/accord.hpc.virginia.edu/privkey.pem"
-
-## Keycloak related variables
-tenant_domain: "{{ gateway_id }}"
-admin_username: "admin"
-admin_password: "{{ vault_admin_password }}"
-oauth_client_key: "{{ vault_oauth_client_key }}"
-oauth_client_secret: "{{ vault_oauth_client_secret }}"
-oidc_discovery_url: "https://iam.scigap.org/auth/realms/{{ tenant_domain }}/.well-known/openid-configuration"
-
-auth_options:
-  - name: "Virgina Accord Science Gateway"
-    oauth_grant_type: "password"
-  - name: "CILogon"
-    oauth_grant_type: "authorization_code"
-    oauth_authorize_url_extra_params: "kc_idp_hint=cilogon"
-    logo: "/assets/cilogon-logo-24x24-b.png"
-oauth_callback_url: "https://{{ vhost_servername }}/callback-url"
-
-gateway_id: "virginaaccord"
-# relative to document root dir
-experiment_data_dir: "{{ user_data_dir }}/accord"
-gateway_data_store_resource_id: "gf4.ucs.indiana.edu_61552681-96f0-462a-a36c-a62a010bffc6"
-gateway_data_store_ssh_public_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCXi0HChWm8JB3dj2Spaz1uAsFWDjZE5NZ/GVQ9Wz++H2TSltoIAj/2lFiIMEwMXsJ4qs9vkHP/co0VHoEBVK7l8D/ZjWJ0imqrlsaagf3N9PowHMcC++VbjUFgdGgP8PYEZDOCNZY1gnokW5oMrxSTZCMgkYZf7Ldv3U+ngiQU1WQFeu2usGKXTLZ+FeIEGwElJKukaifm0jn6nE8osUtpwuhJvV9xZjRqoCZiMsruwyDO0b/fq0JpcUsz9CyYivjB5Y41qju1yYioxn579/o0iVMIwVXduN56Tb9mQ2+h2d8lkAR4Tm/bFGi/ADy46fKkMYkaABDIxDjhQRLGlrjH"
-
-## Portal related variables
-super_admin_portal: "false"
-admin_emails: "['sgg@iu.edu','jaj@virginia.edu']"
-portal_email_username: "pga.airavata@gmail.com"
-portal_email_password: "{{ vault_portal_email_password }}"
-portal_theme: "virginia-accord-gateway-theme"
-portal_theme_repo: "https://github.com/SciGaP/virginia-accord-gateway-theme.git"
-portal_title: "Virgina Accord Science Gateway"
-...
diff --git a/dev-tools/ansible/inventories/scigap/production/pga_config/accord/vault.yml b/dev-tools/ansible/inventories/scigap/production/pga_config/accord/vault.yml
deleted file mode 100644
index d69cc96..0000000
--- a/dev-tools/ansible/inventories/scigap/production/pga_config/accord/vault.yml
+++ /dev/null
@@ -1,18 +0,0 @@
-$ANSIBLE_VAULT;1.1;AES256
-33646462616662326265303837306231346666306462653238646537616631326233623035356266
-6465633732373434303063393439653564306466376162360a396433386630363466396332366535
-38313030313531326332626635623736363166343233326338636164313032356463626665313964
-6435303232343164620a666134356263396434376662656163356430373061633466656530666535
-66303134393662323962386230393132393631373465313361373134303337323966633530386530
-65633936656261646534663663643662613437333032336132626165316631643262613961353638
-35306335323336326264643237353866326430613761323439366638316566653339366264616438
-61376463666236613765653836356435393163646337643135333137393335646464653762636238
-32656639363062353838353333336532653162363666363332333962643232386436623633656666
-38646364373862363461396537376363383833653361343139343763393265306662623835383934
-64393437323035316339643939386234333663643330366361626330373936383838396261313435
-32623236343730373835346465343233643435343637316132653063303638613235366236303732
-64626132353561663136616662636137396563386165656561366537343163656238326465616439
-37663035313933376565643239326463653037396465323636306562373532346331336233326332
-31636362626539383563633834653237636335396630316363616432363062623337303734353430
-65363232623837343830333136373535626436366531356563383161313861346134326162646239
-3461
diff --git a/dev-tools/ansible/inventories/scigap/production/pga_config/ampgateway/vars.yml b/dev-tools/ansible/inventories/scigap/production/pga_config/ampgateway/vars.yml
index 8bd9c59..a3e098a 100644
--- a/dev-tools/ansible/inventories/scigap/production/pga_config/ampgateway/vars.yml
+++ b/dev-tools/ansible/inventories/scigap/production/pga_config/ampgateway/vars.yml
@@ -20,7 +20,6 @@
 
 ---
 pga_repo: "https://github.com/apache/airavata-php-gateway.git"
-git_branch: "master"
 user: "pga"
 group: "pga"
 doc_root_dir: "/var/www/portals/{{ gateway_id }}"
diff --git a/dev-tools/ansible/inventories/scigap/production/pga_config/brandeis/vars.yml b/dev-tools/ansible/inventories/scigap/production/pga_config/brandeis/vars.yml
deleted file mode 100644
index 1d2b909..0000000
--- a/dev-tools/ansible/inventories/scigap/production/pga_config/brandeis/vars.yml
+++ /dev/null
@@ -1,57 +0,0 @@
-#
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
----
-pga_repo: "https://github.com/apache/airavata-php-gateway.git"
-git_branch: "master"
-user: "pga"
-group: "pga"
-doc_root_dir: "/var/www/portals/brandeis"
-vhost_servername: "sciencegateway.sci.brandeis.edu"
-vhost_ssl: False
-
-## Keycloak related variables
-tenant_domain: "{{ gateway_id }}"
-admin_username: "adminuser"
-admin_password: "{{ vault_admin_password }}"
-oauth_client_key: "{{ vault_oauth_client_key }}"
-oauth_client_secret: "{{ vault_oauth_client_secret }}"
-oidc_discovery_url: "https://iam.scigap.org/auth/realms/{{ tenant_domain }}/.well-known/openid-configuration"
-
-auth_options:
-  - name: "Brandeis University Science Gateway"
-    oauth_grant_type: "password"
-oauth_callback_url: "http://{{ vhost_servername }}/callback-url"
-
-gateway_id: "brandeis"
-# relative to document root dir
-experiment_data_dir: "{{ user_data_dir }}/brandeis"
-gateway_data_store_resource_id: "gf4.ucs.indiana.edu_61552681-96f0-462a-a36c-a62a010bffc6"
-gateway_data_store_ssh_public_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCnenzHr90GmK9nGzUFVr2Xt0F8dVtqFTU/nSpEK22M0LcBWDJuX2lGw6tz/gU+j5SRAEu2HJnHb67DbvPG+DAEiCYf4sm94GBHljGjySlvDzC8uZGmOzRE3KCzDan5XnHHHQqXL+HJAOzkODVLhxEpN0AOq90Q+Og+vhJlmGJk6WIdjebBfVd0xcHp0nKFzB54F7f0cVubnt5XOE6rMZTb812RSHIIWVk1s5StVbpiDZMzwRJ4tBd1Oe+4DVSTJyn6SdEN18x2KoFeR6BrM8L5QiXhR8GhXj8MyoQLF5+m6q9Drp76n3qw2GMjGgmC8jdwFFOKRiIKM47u9sGrtljX"
-
-## Portal related variables
-super_admin_portal: "false"
-admin_emails: "['sgg@iu.edu', 'pontiggi@brandeis.edu']"
-portal_email_username: "pga.airavata@gmail.com"
-portal_email_password: "{{ vault_portal_email_password }}"
-portal_theme: "base"
-#portal_theme_repo: ""
-portal_title: "Brandeis University Science Gateway"
-...
diff --git a/dev-tools/ansible/inventories/scigap/production/pga_config/brandeis/vault.yml b/dev-tools/ansible/inventories/scigap/production/pga_config/brandeis/vault.yml
deleted file mode 100644
index 00bafc1..0000000
--- a/dev-tools/ansible/inventories/scigap/production/pga_config/brandeis/vault.yml
+++ /dev/null
@@ -1,18 +0,0 @@
-$ANSIBLE_VAULT;1.1;AES256
-31303634316634363761333939336137353638656138653735393033653134383136363639343633
-3064623061336533393637663664323132313965633336310a666537303338646530363830303166
-38303138373130306430323632393162373465643331333439353563346365383537336636346131
-3236316238373063380a373434346565386131616662646262636237303163386437323632333363
-33303536383839663838313961343665316531666532336666646433643735326231313430623836
-30366230376531333439636263386238386337653939663566633731346333643561666165393537
-66363561346631393936633038396137356563623236366135363464376434383137616534613733
-65336335633164653566343234323236343137626130316330653934323439616130623536356132
-30326139303631663231316262316364353466633463633865653864653764393165613063356537
-65616133656530326133353036656634626531363139376433306633613036313337666261396534
-30366333633936386236363261653332636565393539393538313534303430616361633831313363
-30316236633837643439376637313738356163363430356131346164656562653330646463323239
-62373463313230306261383834373930316363633066353838623639323531386630313438643339
-65343363666263636561343465633565383435333132326634306262326136306465653532393233
-38333566323832663632383836336236643463303333343863623635336338363133376630396464
-39643732303462633130393131303730323565653363623866323366623935373463366136393239
-3065
diff --git a/dev-tools/ansible/inventories/scigap/production/pga_config/csbglsu/vars.yml b/dev-tools/ansible/inventories/scigap/production/pga_config/csbglsu/vars.yml
index 2a9e774..8d7e82a 100644
--- a/dev-tools/ansible/inventories/scigap/production/pga_config/csbglsu/vars.yml
+++ b/dev-tools/ansible/inventories/scigap/production/pga_config/csbglsu/vars.yml
@@ -20,7 +20,6 @@
 
 ---
 pga_repo: "https://github.com/apache/airavata-php-gateway.git"
-git_branch: "master"
 user: "pga"
 group: "pga"
 doc_root_dir: "/var/www/portals/{{ gateway_id }}"
diff --git a/dev-tools/ansible/inventories/scigap/production/pga_config/ddstudio/vars.yml b/dev-tools/ansible/inventories/scigap/production/pga_config/ddstudio/vars.yml
index 1f1c864..4b327e8 100644
--- a/dev-tools/ansible/inventories/scigap/production/pga_config/ddstudio/vars.yml
+++ b/dev-tools/ansible/inventories/scigap/production/pga_config/ddstudio/vars.yml
@@ -20,7 +20,6 @@
 
 ---
 pga_repo: "https://github.com/apache/airavata-php-gateway.git"
-git_branch: "master"
 user: "pga"
 group: "pga"
 doc_root_dir: "/var/www/portals/{{ gateway_id }}"
diff --git a/dev-tools/ansible/inventories/scigap/production/pga_config/demo1/vars.yml b/dev-tools/ansible/inventories/scigap/production/pga_config/demo1/vars.yml
deleted file mode 100644
index 5302ffe..0000000
--- a/dev-tools/ansible/inventories/scigap/production/pga_config/demo1/vars.yml
+++ /dev/null
@@ -1,65 +0,0 @@
-#
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
----
-pga_repo: "https://github.com/apache/airavata-php-gateway.git"
-git_branch: "master"
-user: "pga"
-group: "pga"
-doc_root_dir: "/var/www/portals/{{ gateway_id }}"
-vhost_servername: "demo1.scigap.org"
-vhost_ssl: false
-# TODO: have Ansible manage these files as well
-#ssl_certificate_file: "/etc/letsencrypt/live/hpcgateway.uky.edu/cert.pem"
-#ssl_certificate_chain_file: "/etc/letsencrypt/live/hpcgateway.uky.edu/fullchain.pem"
-#ssl_certificate_key_file: "/etc/letsencrypt/live/hpcgateway.uky.edu/privkey.pem"
-
-## Keycloak related variables
-tenant_domain: "{{ gateway_id }}"
-admin_username: "admin"
-admin_password: "{{ vault_admin_password }}"
-oauth_client_key: "{{ vault_oauth_client_key }}"
-oauth_client_secret: "{{ vault_oauth_client_secret }}"
-oidc_discovery_url: "https://iam.scigap.org/auth/realms/{{ tenant_domain }}/.well-known/openid-configuration"
-
-auth_options:
-  - name: "Airavata Demo Gateway 1"
-    oauth_grant_type: "password"
-# - name: "CILogon"
-#    oauth_grant_type: "authorization_code"
-#   oauth_authorize_url_extra_params: "kc_idp_hint=cilogon"
-#   logo: "/assets/cilogon-logo-24x24-b.png"
-oauth_callback_url: "http://{{ vhost_servername }}/callback-url"
-
-gateway_id: "demo1"
-# relative to document root dir
-experiment_data_dir: "{{ user_data_dir }}/{{ gateway_id }}"
-gateway_data_store_resource_id: "gf4.ucs.indiana.edu_61552681-96f0-462a-a36c-a62a010bffc6"
-gateway_data_store_ssh_public_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCDZqz7IvNgwLfAc9nu6zAmKv+kIuw4u5+e+9pKJIynZaivQqeB7Od0yRt93aGz6FGWSc8AeZeumSQ6tyRkR0R089b4BNwA9Khxk1n1N03nHz4mnTSaAKh6WS2dFodsPhOeJaoJVCSJtRtv5h3O8vMNJGUXGqbo/irxDKj41oVNW8IjoaBXTspNhzwN+cFqjd+o/YtQjpemS5OyfnG52iOb+5ZJFVnAw+QL3Y5HxEeyJSgQLKXLFovvcmqLczu0QpBoC1R27DiHgVq9Ocu3eqI+ySbNKIdj/AQva6yY9sh5MQgoWsATdVb7tnGlypwYZpapDHPgXpIQnFeVe6yZ3iyD"
-
-## Portal related variables
-super_admin_portal: "false"
-admin_emails: "['sgrc-iu-group@iu.edu']"
-portal_email_username: "pga.airavata@gmail.com"
-portal_email_password: "{{ vault_portal_email_password }}"
-#portal_theme: "gsu-gateway-theme"
-#portal_theme_repo: "https://github.com/SciGaP/gsu-gateway-theme"
-portal_title: "Airavata Demo Gateway 1"
-...
diff --git a/dev-tools/ansible/inventories/scigap/production/pga_config/demo1/vault.yml b/dev-tools/ansible/inventories/scigap/production/pga_config/demo1/vault.yml
deleted file mode 100644
index 8e9c2b7..0000000
--- a/dev-tools/ansible/inventories/scigap/production/pga_config/demo1/vault.yml
+++ /dev/null
@@ -1,17 +0,0 @@
-$ANSIBLE_VAULT;1.1;AES256
-38343238373337646663616535313531323233666562333261336239306331643465343461313434
-3636373534643339383834363033656164663632663166350a333838643138633639613263646465
-64393430646165353331663432353731666133636232626133643931643661313964336634326633
-6339373938633734310a626263353030336230666463336562616334336263313235363536376564
-65303632616631343066396161366138623231666534653531666533656537383637366562353634
-62393633636463393761613236616163623365663566326165316336363534646231663962636232
-32386236303432373431316639363037393864353839636663643231643330326565343634663764
-65356432306464386138326564366638306166646134363465363663626164663633373031366330
-39636362633663636633643631363330393362663766613164656465333833303235653538666131
-65366531366165633734316239356434623835633465313133646538626534643939306233643538
-34333761363635346564356131653834313666656331323335366434666533623462656462336434
-36613634616462656639633565343734373362313163643865343031633630663433353964656230
-30346362313433326665643263333837656565656337326662623666626166666234376637333730
-62306334633538383132356533316435646338353538666332663133333830653832663633333932
-66643533643534306134393264643964666230303936393434646335623538333031373665666137
-65633862663533333730
diff --git a/dev-tools/ansible/inventories/scigap/production/pga_config/demo10/vars.yml b/dev-tools/ansible/inventories/scigap/production/pga_config/demo10/vars.yml
deleted file mode 100644
index 75ff727..0000000
--- a/dev-tools/ansible/inventories/scigap/production/pga_config/demo10/vars.yml
+++ /dev/null
@@ -1,65 +0,0 @@
-#
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
----
-pga_repo: "https://github.com/apache/airavata-php-gateway.git"
-git_branch: "master"
-user: "pga"
-group: "pga"
-doc_root_dir: "/var/www/portals/{{ gateway_id }}"
-vhost_servername: "demo10.scigap.org"
-vhost_ssl: false
-# TODO: have Ansible manage these files as well
-#ssl_certificate_file: "/etc/letsencrypt/live/hpcgateway.uky.edu/cert.pem"
-#ssl_certificate_chain_file: "/etc/letsencrypt/live/hpcgateway.uky.edu/fullchain.pem"
-#ssl_certificate_key_file: "/etc/letsencrypt/live/hpcgateway.uky.edu/privkey.pem"
-
-## Keycloak related variables
-tenant_domain: "{{ gateway_id }}"
-admin_username: "admin"
-admin_password: "{{ vault_admin_password }}"
-oauth_client_key: "{{ vault_oauth_client_key }}"
-oauth_client_secret: "{{ vault_oauth_client_secret }}"
-oidc_discovery_url: "https://iam.scigap.org/auth/realms/{{ tenant_domain }}/.well-known/openid-configuration"
-
-auth_options:
-  - name: "Airavata Demo Gateway 10"
-    oauth_grant_type: "password"
-# - name: "CILogon"
-#    oauth_grant_type: "authorization_code"
-#   oauth_authorize_url_extra_params: "kc_idp_hint=cilogon"
-#   logo: "/assets/cilogon-logo-24x24-b.png"
-oauth_callback_url: "http://{{ vhost_servername }}/callback-url"
-
-gateway_id: "demo10"
-# relative to document root dir
-experiment_data_dir: "{{ user_data_dir }}/{{ gateway_id }}"
-gateway_data_store_resource_id: "gf4.ucs.indiana.edu_61552681-96f0-462a-a36c-a62a010bffc6"
-gateway_data_store_ssh_public_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDABWsxAwivq1WDHOom+/espJWQd8xQTR5GseoXAPeAY/9rcLde55F8z6NGYpnlmqD/f4FFHbCcwfGXshGu8YKwxfiiD+tbdjAssbsJTZvyNd1Go6X6Lj28h0ATXXw+MkYYIdJVtQ0disqYYK4oZLiJbsODMn0JBJkPB22a3+6Hl2w+RBTjATPHUIwqSKn3JR8cON5aEjcDYpf97ijlZUMHUBvL1IfgD4W+ERb+jK7JkxXy/RJanWzwld3JjYMFLosRzTP4hsS8pQQ7Nlnt6EChyX4BUhQiN7lIVCegmjMy8Bw2qg+4lu6D0hXQd59FYXH1jD9nqz7+1ZMFo3imHbwx"
-
-## Portal related variables
-super_admin_portal: "false"
-admin_emails: "['sgrc-iu-group@iu.edu']"
-portal_email_username: "pga.airavata@gmail.com"
-portal_email_password: "{{ vault_portal_email_password }}"
-#portal_theme: "gsu-gateway-theme"
-#portal_theme_repo: "https://github.com/SciGaP/gsu-gateway-theme"
-portal_title: "Airavata Demo Gateway 10"
-...
diff --git a/dev-tools/ansible/inventories/scigap/production/pga_config/demo10/vault.yml b/dev-tools/ansible/inventories/scigap/production/pga_config/demo10/vault.yml
deleted file mode 100644
index ae5e23e..0000000
--- a/dev-tools/ansible/inventories/scigap/production/pga_config/demo10/vault.yml
+++ /dev/null
@@ -1,17 +0,0 @@
-$ANSIBLE_VAULT;1.1;AES256
-33346330633364373864323837623063373830623566306234326130633637343036366330656235
-6231316531653936666238386136396564306365613438330a643037383463623262613463353937
-32386239396637313136636438333362393539636363383262306538376631303130643137656334
-3831323166366539300a373630316663333763653236393437323861306661656363326637383330
-63396437336637643063646436613465616432386437393239396365666230653835653537623565
-30373132336438323530656436323834626333633765323835393639663833623938386361363535
-64366132313532396135656362663638656231333835313237333234633264663433663730633732
-35636566363561663930356339326334343636313939626638346638333963356337336430653362
-36386431386438353438373561323631616362393562653437346663323263616230306336336463
-32393265393164323732643063383165663865353739323638356161366331393661643434373037
-61343334613732376532626564666634333538663930336334393332616238313265613630316633
-31336261313031383836363664653239313534333836646665306464326365653532646631633633
-33333962343030393164323034636466303730346439613834656437616631623235313738366330
-35346664373036383332386337363765303733636663343236643264623030306438373633666164
-61393864663738303837313033326239626531356364373538663335356265633530656364613731
-35663830323166383733
diff --git a/dev-tools/ansible/inventories/scigap/production/pga_config/demo2/vars.yml b/dev-tools/ansible/inventories/scigap/production/pga_config/demo2/vars.yml
deleted file mode 100644
index 2c87ec4..0000000
--- a/dev-tools/ansible/inventories/scigap/production/pga_config/demo2/vars.yml
+++ /dev/null
@@ -1,65 +0,0 @@
-#
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
----
-pga_repo: "https://github.com/apache/airavata-php-gateway.git"
-git_branch: "master"
-user: "pga"
-group: "pga"
-doc_root_dir: "/var/www/portals/{{ gateway_id }}"
-vhost_servername: "demo2.scigap.org"
-vhost_ssl: false
-# TODO: have Ansible manage these files as well
-#ssl_certificate_file: "/etc/letsencrypt/live/hpcgateway.uky.edu/cert.pem"
-#ssl_certificate_chain_file: "/etc/letsencrypt/live/hpcgateway.uky.edu/fullchain.pem"
-#ssl_certificate_key_file: "/etc/letsencrypt/live/hpcgateway.uky.edu/privkey.pem"
-
-## Keycloak related variables
-tenant_domain: "{{ gateway_id }}"
-admin_username: "admin"
-admin_password: "{{ vault_admin_password }}"
-oauth_client_key: "{{ vault_oauth_client_key }}"
-oauth_client_secret: "{{ vault_oauth_client_secret }}"
-oidc_discovery_url: "https://iam.scigap.org/auth/realms/{{ tenant_domain }}/.well-known/openid-configuration"
-
-auth_options:
-  - name: "Airavata Demo Gateway 2"
-    oauth_grant_type: "password"
-# - name: "CILogon"
-#    oauth_grant_type: "authorization_code"
-#   oauth_authorize_url_extra_params: "kc_idp_hint=cilogon"
-#   logo: "/assets/cilogon-logo-24x24-b.png"
-oauth_callback_url: "http://{{ vhost_servername }}/callback-url"
-
-gateway_id: "demo2"
-# relative to document root dir
-experiment_data_dir: "{{ user_data_dir }}/{{ gateway_id }}"
-gateway_data_store_resource_id: "gf4.ucs.indiana.edu_61552681-96f0-462a-a36c-a62a010bffc6"
-gateway_data_store_ssh_public_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCF7jECVwkpbhpBwzJ4H63I3Mmz79UhQScPjwBbYzvEj0BehEv3/Xh2OqcT1jMff8WrhuDVb6Psvm02AuGei8btDZPGgn/T26hOWejjH1jySQHpeBnY3Rd87T+BBccRB/4elzMl8mQULHy+CwC9BhAkRmDyp4kxNSACQHmEvEraqLI/v2eB/mNXdUl/nuGquJq7VMLk3TyRbx3kSEGuthRiqeVtDM2XNzs271KHKcJLpCpLmwRK5gaAEbiXfwxNO8+E1+M47TPlEwCOHYxIs9MbxI7Wgn6ejDvw9ID0zAijkTzrA/SpC+3By6jeIhPmjFcsrJAxEYQJ1XDuVYVdjFEv"
-
-## Portal related variables
-super_admin_portal: "false"
-admin_emails: "['sgrc-iu-group@iu.edu']"
-portal_email_username: "pga.airavata@gmail.com"
-portal_email_password: "{{ vault_portal_email_password }}"
-#portal_theme: "gsu-gateway-theme"
-#portal_theme_repo: "https://github.com/SciGaP/gsu-gateway-theme"
-portal_title: "Airavata Demo Gateway 2"
-...
diff --git a/dev-tools/ansible/inventories/scigap/production/pga_config/demo2/vault.yml b/dev-tools/ansible/inventories/scigap/production/pga_config/demo2/vault.yml
deleted file mode 100644
index 45b53a5..0000000
--- a/dev-tools/ansible/inventories/scigap/production/pga_config/demo2/vault.yml
+++ /dev/null
@@ -1,17 +0,0 @@
-$ANSIBLE_VAULT;1.1;AES256
-38323261626662346236383133393763616439393764353261393238653532313565363733383662
-3236646364363831346230623262333130616134323234390a303632386330343764316466613732
-30353064326266333639623862396232643535393834633433353133336365636431666431646439
-3433663634343936300a613863306532656435623166316237353264363766656463616462343462
-61313135396266326638396534643937343735343634306463336364383034383631383232383037
-36336261643364323166343838656361643464326462353631323839343336666137386336376335
-38623462623630393637323961353935326361396662346632353139643133613762666665356531
-62653561643534303137616665663735656432353561386534633661363833356431666362626431
-38303238616532306435323337323131323965376263356436653735363463636133376430653963
-33303864616236356533356237633165363165656463356434626261333966333538383964366434
-39616232636563323862363039313662316231663461356131373631653665633530333163643162
-35323032326637366366383737643534363736626531373863333732303664396261663335643762
-31633064363362313837653533626536356438353738653133336630363433656166373332626462
-30333963656430353731316334653362376638633061373035306665306632333831316264623435
-61316639303530623735366235376366333538633663356365376236343462386666363964656435
-32646333323539636339
diff --git a/dev-tools/ansible/inventories/scigap/production/pga_config/demo3/vars.yml b/dev-tools/ansible/inventories/scigap/production/pga_config/demo3/vars.yml
deleted file mode 100644
index fe34358..0000000
--- a/dev-tools/ansible/inventories/scigap/production/pga_config/demo3/vars.yml
+++ /dev/null
@@ -1,65 +0,0 @@
-#
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
----
-pga_repo: "https://github.com/apache/airavata-php-gateway.git"
-git_branch: "master"
-user: "pga"
-group: "pga"
-doc_root_dir: "/var/www/portals/{{ gateway_id }}"
-vhost_servername: "demo3.scigap.org"
-vhost_ssl: false
-# TODO: have Ansible manage these files as well
-#ssl_certificate_file: "/etc/letsencrypt/live/hpcgateway.uky.edu/cert.pem"
-#ssl_certificate_chain_file: "/etc/letsencrypt/live/hpcgateway.uky.edu/fullchain.pem"
-#ssl_certificate_key_file: "/etc/letsencrypt/live/hpcgateway.uky.edu/privkey.pem"
-
-## Keycloak related variables
-tenant_domain: "{{ gateway_id }}"
-admin_username: "admin"
-admin_password: "{{ vault_admin_password }}"
-oauth_client_key: "{{ vault_oauth_client_key }}"
-oauth_client_secret: "{{ vault_oauth_client_secret }}"
-oidc_discovery_url: "https://iam.scigap.org/auth/realms/{{ tenant_domain }}/.well-known/openid-configuration"
-
-auth_options:
-  - name: "Airavata Demo Gateway 3"
-    oauth_grant_type: "password"
-# - name: "CILogon"
-#    oauth_grant_type: "authorization_code"
-#   oauth_authorize_url_extra_params: "kc_idp_hint=cilogon"
-#   logo: "/assets/cilogon-logo-24x24-b.png"
-oauth_callback_url: "http://{{ vhost_servername }}/callback-url"
-
-gateway_id: "demo3"
-# relative to document root dir
-experiment_data_dir: "{{ user_data_dir }}/{{ gateway_id }}"
-gateway_data_store_resource_id: "gf4.ucs.indiana.edu_61552681-96f0-462a-a36c-a62a010bffc6"
-gateway_data_store_ssh_public_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCYdrEapWYqAQyUWQYXArEhPOkZ5c1QOrXN/GbDV+LjWRP5Sima/OfmxuLjKhYekm89DOEt6dEnmJRzZS/weC88m8uP1pjZWNJnAYiXelQ3vodeXu7/Y118NNWrWurgO9TgdCuPPyfwtwp14F/PVNmxidRsx6++M90lEkEPz3uAFWHzIO4qxtVkBtZFOvhJlG5O/5TmnlSpRyPEGRJzD7qMyktdrIVKGzM4DpAkfNiwbjpnkpiO5oVD1GJbQ/QLGRh/714jXl5OAKpnfsUr/l83pGmYdzZ10YF2MAFt1Yezy492x+5pFMiGdYpuujEyQsSK+AlF1FN4ufGaWt+MlRhJ"
-
-## Portal related variables
-super_admin_portal: "false"
-admin_emails: "['sgrc-iu-group@iu.edu']"
-portal_email_username: "pga.airavata@gmail.com"
-portal_email_password: "{{ vault_portal_email_password }}"
-#portal_theme: "gsu-gateway-theme"
-#portal_theme_repo: "https://github.com/SciGaP/gsu-gateway-theme"
-portal_title: "Airavata Demo Gateway 3"
-...
diff --git a/dev-tools/ansible/inventories/scigap/production/pga_config/demo3/vault.yml b/dev-tools/ansible/inventories/scigap/production/pga_config/demo3/vault.yml
deleted file mode 100644
index e247154..0000000
--- a/dev-tools/ansible/inventories/scigap/production/pga_config/demo3/vault.yml
+++ /dev/null
@@ -1,17 +0,0 @@
-$ANSIBLE_VAULT;1.1;AES256
-63353834313336353164323666633233316333373461666566653964373366663333306164643038
-6164393262613664653166333034333939633266316237630a663639306232396662643937333035
-30633864643335393633373538663366396636316134343866356363316364636338653236343035
-3461613236396134300a613433373164626465626637373765303663613834323730316331616534
-31616663326338613736653135353730373162373166623561353566626263353035356637336535
-65633661613162376433623535306434316332363633643061636336356162616632623439643961
-32323766356335363934326332343738613062393731613161343465303632646466636531333638
-63373432326432316265666132306161623564326238656538326563393930346236396134663136
-65653561393333373331303134363537623337346661616439313239393763643133336536646430
-36366431333964353333303739306162303463306562313137643930306237366639623363393731
-30353939366438393634373838323833323039393631306265666437613231386536323233663436
-34313237376232333464623238366435333237303463363534626235326265393736313330326264
-64303264316237636438626430663662393836616462323665316332326130646135643732333561
-65313535346532666131613961643764623366666236353236346434373539636433313032343763
-35623033326463353632333035656561333161303266636235363939366262343965623035653938
-31666163336338306534
diff --git a/dev-tools/ansible/inventories/scigap/production/pga_config/demo4/vars.yml b/dev-tools/ansible/inventories/scigap/production/pga_config/demo4/vars.yml
deleted file mode 100644
index a05f5ad..0000000
--- a/dev-tools/ansible/inventories/scigap/production/pga_config/demo4/vars.yml
+++ /dev/null
@@ -1,65 +0,0 @@
-#
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
----
-pga_repo: "https://github.com/apache/airavata-php-gateway.git"
-git_branch: "master"
-user: "pga"
-group: "pga"
-doc_root_dir: "/var/www/portals/{{ gateway_id }}"
-vhost_servername: "demo4.scigap.org"
-vhost_ssl: false
-# TODO: have Ansible manage these files as well
-#ssl_certificate_file: "/etc/letsencrypt/live/hpcgateway.uky.edu/cert.pem"
-#ssl_certificate_chain_file: "/etc/letsencrypt/live/hpcgateway.uky.edu/fullchain.pem"
-#ssl_certificate_key_file: "/etc/letsencrypt/live/hpcgateway.uky.edu/privkey.pem"
-
-## Keycloak related variables
-tenant_domain: "{{ gateway_id }}"
-admin_username: "admin"
-admin_password: "{{ vault_admin_password }}"
-oauth_client_key: "{{ vault_oauth_client_key }}"
-oauth_client_secret: "{{ vault_oauth_client_secret }}"
-oidc_discovery_url: "https://iam.scigap.org/auth/realms/{{ tenant_domain }}/.well-known/openid-configuration"
-
-auth_options:
-  - name: "Airavata Demo Gateway 4"
-    oauth_grant_type: "password"
-# - name: "CILogon"
-#    oauth_grant_type: "authorization_code"
-#   oauth_authorize_url_extra_params: "kc_idp_hint=cilogon"
-#   logo: "/assets/cilogon-logo-24x24-b.png"
-oauth_callback_url: "http://{{ vhost_servername }}/callback-url"
-
-gateway_id: "demo4"
-# relative to document root dir
-experiment_data_dir: "{{ user_data_dir }}/{{ gateway_id }}"
-gateway_data_store_resource_id: "gf4.ucs.indiana.edu_61552681-96f0-462a-a36c-a62a010bffc6"
-gateway_data_store_ssh_public_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCor8Jb1H+Lj/43h9C0EAerV8fOQvVHALSlQeLbARO1cFFLl4LLxwCZUfJVa0mFTe1TFd4PFjJRmbgij1XAhzjTTDDAz21jkJqy30hTTGDdo2B/zEE5+sknZtAk9Y6cEMhK6TenxZ8o3HtrxNhRHFhKN7llv7Y21dtsH4nlI4h1hUZjT/TooyPl7epxajIr838rFrh6wd0XlCNgMIjfH7iZdN5VQ8Xy2EwR9ajlgOQIPwD4Xswz/su65cLK5jNYOi68bo6hKmINXV3xDsEwZzMZ7lkhTrlwuE9bhgHymtHzq8KJFlJvuPdE9K6BhCFw7j6uu2Mp7rL46B5VobxuAG3V"
-
-## Portal related variables
-super_admin_portal: "false"
-admin_emails: "['sgrc-iu-group@iu.edu']"
-portal_email_username: "pga.airavata@gmail.com"
-portal_email_password: "{{ vault_portal_email_password }}"
-#portal_theme: "gsu-gateway-theme"
-#portal_theme_repo: "https://github.com/SciGaP/gsu-gateway-theme"
-portal_title: "Airavata Demo Gateway 4"
-...
diff --git a/dev-tools/ansible/inventories/scigap/production/pga_config/demo4/vault.yml b/dev-tools/ansible/inventories/scigap/production/pga_config/demo4/vault.yml
deleted file mode 100644
index 1d500ec..0000000
--- a/dev-tools/ansible/inventories/scigap/production/pga_config/demo4/vault.yml
+++ /dev/null
@@ -1,17 +0,0 @@
-$ANSIBLE_VAULT;1.1;AES256
-39303736633565376636323035343962316336633331346631613763663734643064636363363866
-3164323731623934663464636632363538303635626565310a376136623738313839303066316264
-63663839323434343036623765363164656532653161356261363035396438646335316435346566
-3661373737656163370a623462636636323932356435643833353464366164393864313764353266
-63663534343739626239656537333635346362653863633533393135323632376663396638646430
-32363532303766353535326239316333653230666363616233666135306666326135643165323430
-36626130636235663164306237303937383530623666643531313237383164663539336331346534
-64623530373236323134373662383765316466393835336537336539313534616437623034626462
-66306164303732343463656661313836363638626138663363373533303635633537666163623365
-35323931373338616136396262303932353464663664626661636438383739623236313463303831
-39306335666232386665316264323165386137656263306633303930306238666331666339373034
-30336566613961373232343964373164316362373338313162373139343732636130303331663232
-65646637633963653066326365356334666162383762353437356463653266313565626539383364
-66393936313837356165616337633033353964353864356166303439363736613839323063333832
-63613935316663366234343761363037636533366634643265336330363035396531333031653032
-32353761343866633532
diff --git a/dev-tools/ansible/inventories/scigap/production/pga_config/demo5/vars.yml b/dev-tools/ansible/inventories/scigap/production/pga_config/demo5/vars.yml
deleted file mode 100644
index 104ff85..0000000
--- a/dev-tools/ansible/inventories/scigap/production/pga_config/demo5/vars.yml
+++ /dev/null
@@ -1,65 +0,0 @@
-#
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
----
-pga_repo: "https://github.com/apache/airavata-php-gateway.git"
-git_branch: "master"
-user: "pga"
-group: "pga"
-doc_root_dir: "/var/www/portals/{{ gateway_id }}"
-vhost_servername: "demo5.scigap.org"
-vhost_ssl: false
-# TODO: have Ansible manage these files as well
-#ssl_certificate_file: "/etc/letsencrypt/live/hpcgateway.uky.edu/cert.pem"
-#ssl_certificate_chain_file: "/etc/letsencrypt/live/hpcgateway.uky.edu/fullchain.pem"
-#ssl_certificate_key_file: "/etc/letsencrypt/live/hpcgateway.uky.edu/privkey.pem"
-
-## Keycloak related variables
-tenant_domain: "{{ gateway_id }}"
-admin_username: "admin"
-admin_password: "{{ vault_admin_password }}"
-oauth_client_key: "{{ vault_oauth_client_key }}"
-oauth_client_secret: "{{ vault_oauth_client_secret }}"
-oidc_discovery_url: "https://iam.scigap.org/auth/realms/{{ tenant_domain }}/.well-known/openid-configuration"
-
-auth_options:
-  - name: "Airavata Demo Gateway 5"
-    oauth_grant_type: "password"
-# - name: "CILogon"
-#    oauth_grant_type: "authorization_code"
-#   oauth_authorize_url_extra_params: "kc_idp_hint=cilogon"
-#   logo: "/assets/cilogon-logo-24x24-b.png"
-oauth_callback_url: "http://{{ vhost_servername }}/callback-url"
-
-gateway_id: "demo5"
-# relative to document root dir
-experiment_data_dir: "{{ user_data_dir }}/{{ gateway_id }}"
-gateway_data_store_resource_id: "gf4.ucs.indiana.edu_61552681-96f0-462a-a36c-a62a010bffc6"
-gateway_data_store_ssh_public_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCHTXaXh3s/+G9EP62+b2nOCscbQLsk2SF5USHdHsurrLGJCY25eBsfjyncQdbtj+agly20PRf8bLHVoJk3ln1aPJqImVjRcrGUz22HbwtByMtNZAx3VnW5HalnhrXzYjC2O34082UUtBcb8+KXL/nlNDNouiFu7dqH+4vyOHPa6vZ3l6OLrr8fOm6rEaCp8YrtJeosazPquVE5mxiWFMRjYKOSyhh07v/0smBumoYRKzhn85d08FXYvcw6zA8X5fCKnB3Eqc53Mae3Hpsa4ovN4Q1+Adv3k/QtKZgdjGKRiGLMl6XZWejE1Nwf6zWM6HvLeWq5J97ZrcFjNwo64Hdd"
-
-## Portal related variables
-super_admin_portal: "false"
-admin_emails: "['sgrc-iu-group@iu.edu']"
-portal_email_username: "pga.airavata@gmail.com"
-portal_email_password: "{{ vault_portal_email_password }}"
-#portal_theme: "gsu-gateway-theme"
-#portal_theme_repo: "https://github.com/SciGaP/gsu-gateway-theme"
-portal_title: "Airavata Demo Gateway 5"
-...
diff --git a/dev-tools/ansible/inventories/scigap/production/pga_config/demo5/vault.yml b/dev-tools/ansible/inventories/scigap/production/pga_config/demo5/vault.yml
deleted file mode 100644
index 89f32de..0000000
--- a/dev-tools/ansible/inventories/scigap/production/pga_config/demo5/vault.yml
+++ /dev/null
@@ -1,17 +0,0 @@
-$ANSIBLE_VAULT;1.1;AES256
-65623537383833636238663163313339353239653933653137363532633765303230626265613233
-3434323065353633626131343931376166323938353631330a616534633635623635333137383336
-33353866643365653134633532633562373163653334306130666636396635616335646466393635
-3064653330623339640a313663663264643030303264666464666338346332323933356130396134
-37396233386239663234643533393264336337383037303363376136376136326163363164616261
-63643239393739353031356235663161313535383861386437353536636661333566363230643138
-35633030396130363634646335313239363135663230363335306161383331653831653464323930
-66303562343634306264346363663236656235303361623136393735313832666431376163336130
-34316438343461613162313364613337663963646439656138336537316565306566356234613363
-64346664333561356335303830623033363164313439346630306464396163303134623238663630
-35616364633635633263646332346139383937386335303339393334663538386532383963396134
-30613264366161646636326532626633363739626632386330306532326639626537346437613432
-39323266333834303537653165306239656463626462616464366465343234666265363935343230
-63663235656662643030626638626234333432656265376439316238323533303439373539303064
-39353832336664303435623230386661663663633961383134323961636365326266323834356334
-30316433613933646635
diff --git a/dev-tools/ansible/inventories/scigap/production/pga_config/demo6/vars.yml b/dev-tools/ansible/inventories/scigap/production/pga_config/demo6/vars.yml
deleted file mode 100644
index 24fe7ba..0000000
--- a/dev-tools/ansible/inventories/scigap/production/pga_config/demo6/vars.yml
+++ /dev/null
@@ -1,65 +0,0 @@
-#
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
----
-pga_repo: "https://github.com/apache/airavata-php-gateway.git"
-git_branch: "master"
-user: "pga"
-group: "pga"
-doc_root_dir: "/var/www/portals/{{ gateway_id }}"
-vhost_servername: "demo6.scigap.org"
-vhost_ssl: false
-# TODO: have Ansible manage these files as well
-#ssl_certificate_file: "/etc/letsencrypt/live/hpcgateway.uky.edu/cert.pem"
-#ssl_certificate_chain_file: "/etc/letsencrypt/live/hpcgateway.uky.edu/fullchain.pem"
-#ssl_certificate_key_file: "/etc/letsencrypt/live/hpcgateway.uky.edu/privkey.pem"
-
-## Keycloak related variables
-tenant_domain: "{{ gateway_id }}"
-admin_username: "admin"
-admin_password: "{{ vault_admin_password }}"
-oauth_client_key: "{{ vault_oauth_client_key }}"
-oauth_client_secret: "{{ vault_oauth_client_secret }}"
-oidc_discovery_url: "https://iam.scigap.org/auth/realms/{{ tenant_domain }}/.well-known/openid-configuration"
-
-auth_options:
-  - name: "Airavata Demo Gateway 6"
-    oauth_grant_type: "password"
-# - name: "CILogon"
-#    oauth_grant_type: "authorization_code"
-#   oauth_authorize_url_extra_params: "kc_idp_hint=cilogon"
-#   logo: "/assets/cilogon-logo-24x24-b.png"
-oauth_callback_url: "http://{{ vhost_servername }}/callback-url"
-
-gateway_id: "demo6"
-# relative to document root dir
-experiment_data_dir: "{{ user_data_dir }}/{{ gateway_id }}"
-gateway_data_store_resource_id: "gf4.ucs.indiana.edu_61552681-96f0-462a-a36c-a62a010bffc6"
-gateway_data_store_ssh_public_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCHoD39/2vYtR7iMFenMepCbSa8zqfxdFR+6hkREHU+4TT09nHRoP1E6F1hy56nEGpnqrzaYGj4my5BxHt8yZhiM98KvTNnheJOOtPiR4tUohrzSV5G2QYI2lE0kN0Q6RcIcTJuWkJjr6YLcGyK1P2j0dKpQ7U2xqFWfKtCxZ3qlQRmiuUQgvguc4SyYoCDo+RL2ESyiiggEVL8vo4yWPS4OUJS6nnzn8D74b5xBkKyumJPQdarobgcfEuc+uIv8nTkn4lodP8iz6NY+yZYHO4S5G5zqPMtitxziHwr3L2Xg5jy/k86HpaMgXBpQq6cgSo5aSU/YsjG10SBaIKqFn5/"
-
-## Portal related variables
-super_admin_portal: "false"
-admin_emails: "['sgrc-iu-group@iu.edu']"
-portal_email_username: "pga.airavata@gmail.com"
-portal_email_password: "{{ vault_portal_email_password }}"
-#portal_theme: "gsu-gateway-theme"
-#portal_theme_repo: "https://github.com/SciGaP/gsu-gateway-theme"
-portal_title: "Airavata Demo Gateway 6"
-...
diff --git a/dev-tools/ansible/inventories/scigap/production/pga_config/demo6/vault.yml b/dev-tools/ansible/inventories/scigap/production/pga_config/demo6/vault.yml
deleted file mode 100644
index 3232a92..0000000
--- a/dev-tools/ansible/inventories/scigap/production/pga_config/demo6/vault.yml
+++ /dev/null
@@ -1,17 +0,0 @@
-$ANSIBLE_VAULT;1.1;AES256
-35393835646335373866656236346336303362646434393930356634633734396264623937633235
-3739616663323438303461643332326332643162663965630a376635616530663030643433386364
-63313131396165373339393038636362343436653435353566343439336265363463623035383561
-3238376563303732360a393436313666653332346664643163353666363637303139643666356232
-66343639326665356637656630616438396535653764383537643936663234363364663333396136
-36343038336563646434653464303737613864396233363435333265623366343961633165356636
-62663431643932336266386566356166636132343164326432643933636338626432373533613565
-65303337363533343235363535616265376433333338303566636363393330363835393366643438
-31323265393139643162663639333236323835306537633939336331313134643464336631353436
-36303437376163363733316133336364373332393131666330313662666266373233346137623035
-36623836663138643737653539653864653430653563313833336230306132626262346432323034
-31666364353766613165613563363630366230343366343230363238346161653163303633626163
-38656634363236336139346135616636626635346330396237313164343339633664663361366262
-32373630373739323664386232386137376264316463663666346438646131396461393639316639
-37343836353432303832386330333665363839616565353332633535313563363139646561333335
-33613236306134373139
diff --git a/dev-tools/ansible/inventories/scigap/production/pga_config/demo7/vars.yml b/dev-tools/ansible/inventories/scigap/production/pga_config/demo7/vars.yml
deleted file mode 100644
index b6fd6fb..0000000
--- a/dev-tools/ansible/inventories/scigap/production/pga_config/demo7/vars.yml
+++ /dev/null
@@ -1,65 +0,0 @@
-#
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
----
-pga_repo: "https://github.com/apache/airavata-php-gateway.git"
-git_branch: "master"
-user: "pga"
-group: "pga"
-doc_root_dir: "/var/www/portals/{{ gateway_id }}"
-vhost_servername: "demo7.scigap.org"
-vhost_ssl: false
-# TODO: have Ansible manage these files as well
-#ssl_certificate_file: "/etc/letsencrypt/live/hpcgateway.uky.edu/cert.pem"
-#ssl_certificate_chain_file: "/etc/letsencrypt/live/hpcgateway.uky.edu/fullchain.pem"
-#ssl_certificate_key_file: "/etc/letsencrypt/live/hpcgateway.uky.edu/privkey.pem"
-
-## Keycloak related variables
-tenant_domain: "{{ gateway_id }}"
-admin_username: "admin"
-admin_password: "{{ vault_admin_password }}"
-oauth_client_key: "{{ vault_oauth_client_key }}"
-oauth_client_secret: "{{ vault_oauth_client_secret }}"
-oidc_discovery_url: "https://iam.scigap.org/auth/realms/{{ tenant_domain }}/.well-known/openid-configuration"
-
-auth_options:
-  - name: "Airavata Demo Gateway 7"
-    oauth_grant_type: "password"
-# - name: "CILogon"
-#    oauth_grant_type: "authorization_code"
-#   oauth_authorize_url_extra_params: "kc_idp_hint=cilogon"
-#   logo: "/assets/cilogon-logo-24x24-b.png"
-oauth_callback_url: "http://{{ vhost_servername }}/callback-url"
-
-gateway_id: "demo7"
-# relative to document root dir
-experiment_data_dir: "{{ user_data_dir }}/{{ gateway_id }}"
-gateway_data_store_resource_id: "gf4.ucs.indiana.edu_61552681-96f0-462a-a36c-a62a010bffc6"
-gateway_data_store_ssh_public_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCynXbrDvmrc++/O3HCNk64B0+3lfAzhc8MvrVNyG1bC7aKjBnKeiW7RNUTk5OE+SsRt9jybeNkm0J/Lijhs5v3FAzb3be6/FTwZGbA9JfVPICDJNmaBY8lTr8mPQx5jYo9wEp/WPOAz1S47G2STxpIiBOkcPkqEQARooRALOERQHKBdPUJlJko5pdSbilStWqkJsNawo10EBin23wOTXPcX41U/cONZcjfR4/MlaeVbx98H9li6vUIgqkVMzji1RCUaOKHLrg35Cbsrvz8pbV0+cPAJ4ixOsm3EDwyzdEtoC2mAd+OFC2KrFk2YAtJqEVYXxkb4rtkHOKOQ5yJ1CH/"
-
-## Portal related variables
-super_admin_portal: "false"
-admin_emails: "['sgrc-iu-group@iu.edu']"
-portal_email_username: "pga.airavata@gmail.com"
-portal_email_password: "{{ vault_portal_email_password }}"
-#portal_theme: "gsu-gateway-theme"
-#portal_theme_repo: "https://github.com/SciGaP/gsu-gateway-theme"
-portal_title: "Airavata Demo Gateway 7"
-...
diff --git a/dev-tools/ansible/inventories/scigap/production/pga_config/demo7/vault.yml b/dev-tools/ansible/inventories/scigap/production/pga_config/demo7/vault.yml
deleted file mode 100644
index b3685e6..0000000
--- a/dev-tools/ansible/inventories/scigap/production/pga_config/demo7/vault.yml
+++ /dev/null
@@ -1,17 +0,0 @@
-$ANSIBLE_VAULT;1.1;AES256
-30666333656364663663343632373634633337666565366132613836643038633835323966333334
-3765633036646336373664333839616562356530396265320a656438633061363530643135343939
-36333335343563326237313238343035643731393939636661313064626364306536653163386634
-3337663665383663300a666632626365356232633862633362366432363263613030663136346133
-32373436323832643838643361616463663739356264666236366362313962363134346536613439
-37373764653664653037363233653730323563343134663564353165356430326366623933633161
-31323865313638356330393965363561326231313533623437316164376664663635653936346264
-35356464653966343363386563373261306432636261646332303165613136396132393037356366
-35666538306434616230326664616532616633303731346335633166626532323137313662653432
-61303136376231303330613734326164376138653339386464636161623435346162353036373031
-61353730323137373038316337336331656235396131306336343065636333623935376435376461
-63303534343865643139313666313737303462333065383365323931663365386134646563343432
-64623363663635303361313264643632393965346630643564396562376239373034663637373937
-61386338343162393065653364343561656435346631616165646365653837646161613864623862
-32663739386464653934373766663364363330396133303830353732653038613237393062616231
-63393663666234386631
diff --git a/dev-tools/ansible/inventories/scigap/production/pga_config/demo8/vars.yml b/dev-tools/ansible/inventories/scigap/production/pga_config/demo8/vars.yml
deleted file mode 100644
index 4683d2d..0000000
--- a/dev-tools/ansible/inventories/scigap/production/pga_config/demo8/vars.yml
+++ /dev/null
@@ -1,65 +0,0 @@
-#
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
----
-pga_repo: "https://github.com/apache/airavata-php-gateway.git"
-git_branch: "master"
-user: "pga"
-group: "pga"
-doc_root_dir: "/var/www/portals/{{ gateway_id }}"
-vhost_servername: "demo8.scigap.org"
-vhost_ssl: false
-# TODO: have Ansible manage these files as well
-#ssl_certificate_file: "/etc/letsencrypt/live/hpcgateway.uky.edu/cert.pem"
-#ssl_certificate_chain_file: "/etc/letsencrypt/live/hpcgateway.uky.edu/fullchain.pem"
-#ssl_certificate_key_file: "/etc/letsencrypt/live/hpcgateway.uky.edu/privkey.pem"
-
-## Keycloak related variables
-tenant_domain: "{{ gateway_id }}"
-admin_username: "admin"
-admin_password: "{{ vault_admin_password }}"
-oauth_client_key: "{{ vault_oauth_client_key }}"
-oauth_client_secret: "{{ vault_oauth_client_secret }}"
-oidc_discovery_url: "https://iam.scigap.org/auth/realms/{{ tenant_domain }}/.well-known/openid-configuration"
-
-auth_options:
-  - name: "Airavata Demo Gateway 8"
-    oauth_grant_type: "password"
-# - name: "CILogon"
-#    oauth_grant_type: "authorization_code"
-#   oauth_authorize_url_extra_params: "kc_idp_hint=cilogon"
-#   logo: "/assets/cilogon-logo-24x24-b.png"
-oauth_callback_url: "http://{{ vhost_servername }}/callback-url"
-
-gateway_id: "demo8"
-# relative to document root dir
-experiment_data_dir: "{{ user_data_dir }}/{{ gateway_id }}"
-gateway_data_store_resource_id: "gf4.ucs.indiana.edu_61552681-96f0-462a-a36c-a62a010bffc6"
-gateway_data_store_ssh_public_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCI0MtuBmphPFDfdVR1YsYFUe8Y1LnBsB6HWh36VlNsp1OjDjuYSjjJWcxlZwn8K4MaCF/xaZZN083Hb6pMAnpFcO5iMg/4jZF9nLvMEUSe8YTBlGxv7zgvov5uRJnrIlIqsFDb3l5Izv1atglZ9AoEvuW45QXXXsuDtDzMz813Vf8b4BTb0HWkoWTdwY2wjABqg1R3unBvkeUzm6XHAW+Mk3622POmLufwKzrHx4GlNPS/Dn6rZJdBlNWN5uDHduz1IaE8lh3aTskJeltdeicHYbOwwVmEPs4ReXhMUYVQLemetqOWyHjDHIstf+WnQ8jsEcttrPu/48UrxJ2tiRRl"
-
-## Portal related variables
-super_admin_portal: "false"
-admin_emails: "['sgrc-iu-group@iu.edu']"
-portal_email_username: "pga.airavata@gmail.com"
-portal_email_password: "{{ vault_portal_email_password }}"
-#portal_theme: "gsu-gateway-theme"
-#portal_theme_repo: "https://github.com/SciGaP/gsu-gateway-theme"
-portal_title: "Airavata Demo Gateway 8"
-...
diff --git a/dev-tools/ansible/inventories/scigap/production/pga_config/demo8/vault.yml b/dev-tools/ansible/inventories/scigap/production/pga_config/demo8/vault.yml
deleted file mode 100644
index b3cfaff..0000000
--- a/dev-tools/ansible/inventories/scigap/production/pga_config/demo8/vault.yml
+++ /dev/null
@@ -1,17 +0,0 @@
-$ANSIBLE_VAULT;1.1;AES256
-35353731633232313536343838373637323433333361633635383636316261303162653334633466
-3137343265383861626266633662383336373437663865330a383733323838383132363739656533
-37633866373333643730316437333731386564313233623966383735363533616334646636353064
-3064326162343633370a653333613836333733393637616133346432323965646430656532356464
-39623963663032613038363435393961346166383831633239626265313639326363343537663232
-65386535396139323864396264363136636537323739383064363935633963306533373237353561
-38333035376566323639353632623334343635613565643962393461363836366634393864323636
-31646631366139336564356561386362353436646235313034376238306139353030366266356162
-34363462396634386330333737643933373435613834353732396637646461386139616166386533
-63333164626163653437656165653162333639396433323261613161336662623162616438363332
-38376566396265386666323736333731383133356633333363653132336338636535663063613838
-38663935613331303462626635656135626435333136336636356663633837613837666236343066
-63393834393532653964396562383936393861643837623939393736393537363734616363653434
-63353465636133653738653434386337386239323434313835303861636166333037343761353933
-36383665336234323966663139333266323435356636336632326534636132386565396134663766
-64333864653733313962
diff --git a/dev-tools/ansible/inventories/scigap/production/pga_config/demo9/vars.yml b/dev-tools/ansible/inventories/scigap/production/pga_config/demo9/vars.yml
deleted file mode 100644
index 76736af..0000000
--- a/dev-tools/ansible/inventories/scigap/production/pga_config/demo9/vars.yml
+++ /dev/null
@@ -1,65 +0,0 @@
-#
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
----
-pga_repo: "https://github.com/apache/airavata-php-gateway.git"
-git_branch: "master"
-user: "pga"
-group: "pga"
-doc_root_dir: "/var/www/portals/{{ gateway_id }}"
-vhost_servername: "demo9.scigap.org"
-vhost_ssl: false
-# TODO: have Ansible manage these files as well
-#ssl_certificate_file: "/etc/letsencrypt/live/hpcgateway.uky.edu/cert.pem"
-#ssl_certificate_chain_file: "/etc/letsencrypt/live/hpcgateway.uky.edu/fullchain.pem"
-#ssl_certificate_key_file: "/etc/letsencrypt/live/hpcgateway.uky.edu/privkey.pem"
-
-## Keycloak related variables
-tenant_domain: "{{ gateway_id }}"
-admin_username: "admin"
-admin_password: "{{ vault_admin_password }}"
-oauth_client_key: "{{ vault_oauth_client_key }}"
-oauth_client_secret: "{{ vault_oauth_client_secret }}"
-oidc_discovery_url: "https://iam.scigap.org/auth/realms/{{ tenant_domain }}/.well-known/openid-configuration"
-
-auth_options:
-  - name: "Airavata Demo Gateway 9"
-    oauth_grant_type: "password"
-# - name: "CILogon"
-#    oauth_grant_type: "authorization_code"
-#   oauth_authorize_url_extra_params: "kc_idp_hint=cilogon"
-#   logo: "/assets/cilogon-logo-24x24-b.png"
-oauth_callback_url: "http://{{ vhost_servername }}/callback-url"
-
-gateway_id: "demo9"
-# relative to document root dir
-experiment_data_dir: "{{ user_data_dir }}/{{ gateway_id }}"
-gateway_data_store_resource_id: "gf4.ucs.indiana.edu_61552681-96f0-462a-a36c-a62a010bffc6"
-gateway_data_store_ssh_public_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDT2ivZMmjyt764tO2MwDEDGTDZ6b8eztRz9SRLNo3LRJZ2NV/wue/LnsB3c96EPIrijvZrpLF7bAdRundsrFe5rwuQ4o6VqDGFkZ5RVc80JTjl4GSN42JFBIyKdGAA8wxxITHWgIuC3zIhzzy0m1fN8uvmKgNHOR/6L9mDoKfyYi9qWs6VZWL81idtwhy/tHc67iH/dBmdPlJRvKjFins+QQdYR1gu5bDgCVqaoLNB6GjbvRo++36tsmAtWn3DatVzednWYXWFK0XpzmaGb5idZeZcHXmIEYvZu7zd6KOC9JZvtraxju3rbedoVgAPE46rflYufHdM56HExysdg7Kt"
-
-## Portal related variables
-super_admin_portal: "false"
-admin_emails: "['sgrc-iu-group@iu.edu']"
-portal_email_username: "pga.airavata@gmail.com"
-portal_email_password: "{{ vault_portal_email_password }}"
-#portal_theme: "gsu-gateway-theme"
-#portal_theme_repo: "https://github.com/SciGaP/gsu-gateway-theme"
-portal_title: "Airavata Demo Gateway 9"
-...
diff --git a/dev-tools/ansible/inventories/scigap/production/pga_config/demo9/vault.yml b/dev-tools/ansible/inventories/scigap/production/pga_config/demo9/vault.yml
deleted file mode 100644
index 2ee632a..0000000
--- a/dev-tools/ansible/inventories/scigap/production/pga_config/demo9/vault.yml
+++ /dev/null
@@ -1,17 +0,0 @@
-$ANSIBLE_VAULT;1.1;AES256
-31653763316230656131366162303164323431333265323165313861663761346162323634656333
-3763356362623134363138373935633761346635656163660a643664613262303637373736333833
-64633566376639653537313134303936663134623737313361646165646234626336353435336266
-3431653066633938300a666535663439663636306233316363383263333864626130393865646661
-33313333663162636637343737393336346134613261343565636166343337323738346633343839
-61396131303833393534373238373733656533383165626538316664323763336461623138383138
-31613931363836386266346435363961633164383230383562336561636235313132356234323163
-66316366303330633736303630393139303161636463356466366466303764383631666638326638
-62323837343739353734323163303964333664343631613531326436616265313438393563363537
-34323030323036393930306161396664336130356236633465633432363032323962306638373436
-64326534393663356261653839663735623431386233653663363234323838333566336365353338
-30613435326164313331643339633866383232316565353438386566613165396537313633656266
-33613263303061626266373335623035313738376433333831363037363234366264343162616534
-64396634323930336430366631383734333539643135303163663265643466613033346361373835
-33646534376231336135656166396138323934666239393261663434653230363766326433326164
-31323631356132663762
diff --git a/dev-tools/ansible/inventories/scigap/production/pga_config/distantreader/vars.yml b/dev-tools/ansible/inventories/scigap/production/pga_config/distantreader/vars.yml
index 7540197..084b0bc 100644
--- a/dev-tools/ansible/inventories/scigap/production/pga_config/distantreader/vars.yml
+++ b/dev-tools/ansible/inventories/scigap/production/pga_config/distantreader/vars.yml
@@ -20,7 +20,6 @@
 
 ---
 pga_repo: "https://github.com/apache/airavata-php-gateway.git"
-git_branch: "master"
 user: "pga"
 group: "pga"
 doc_root_dir: "/var/www/portals/{{ gateway_id }}"
@@ -48,7 +47,7 @@ auth_options:
     oauth_authorize_url_extra_params: "kc_idp_hint=cilogon"
     logo: "/assets/cilogon-logo-24x24-b.png"
 
-    oauth_callback_url: "https://{{ vhost_servername }}/callback-url"
+oauth_callback_url: "https://{{ vhost_servername }}/callback-url"
 
 gateway_id: "distantreader"
 # relative to document root dir
diff --git a/dev-tools/ansible/inventories/scigap/production/pga_config/epwgateway/vars.yml b/dev-tools/ansible/inventories/scigap/production/pga_config/epwgateway/vars.yml
index 0f4e436..fd1cac7 100644
--- a/dev-tools/ansible/inventories/scigap/production/pga_config/epwgateway/vars.yml
+++ b/dev-tools/ansible/inventories/scigap/production/pga_config/epwgateway/vars.yml
@@ -20,17 +20,15 @@
 
 ---
 pga_repo: "https://github.com/apache/airavata-php-gateway.git"
-git_branch: "master"
 user: "pga"
 group: "pga"
 doc_root_dir: "/var/www/portals/{{ gateway_id }}"
-vhost_servername: "www.epw-gateway.cs.binghamton.edu"
-#vhost_serveralias: "sciencegateway.searchsra.org"
-vhost_ssl: false
+vhost_servername: "epw-gateway.cs.binghamton.edu"
+vhost_ssl: true
 # TODO: have Ansible manage these files as well
-#ssl_certificate_file: "/etc/letsencrypt/live/www.searchsra.org/cert.pem"
-#ssl_certificate_chain_file: "/etc/letsencrypt/live/www.searchsra.org/fullchain.pem"
-#ssl_certificate_key_file: "/etc/letsencrypt/live/www.searchsra.org/privkey.pem"
+ssl_certificate_file: "/etc/letsencrypt/live/epw-gateway.cs.binghamton.edu/cert.pem"
+ssl_certificate_chain_file: "/etc/letsencrypt/live/epw-gateway.cs.binghamton.edu/fullchain.pem"
+ssl_certificate_key_file: "/etc/letsencrypt/live/epw-gateway.cs.binghamton.edu/privkey.pem"
 
 ## Keycloak related variables
 tenant_domain: "{{ gateway_id }}"
diff --git a/dev-tools/ansible/inventories/scigap/production/pga_config/gatech/vars.yml b/dev-tools/ansible/inventories/scigap/production/pga_config/gatech/vars.yml
index ea6b399..b15fa15 100644
--- a/dev-tools/ansible/inventories/scigap/production/pga_config/gatech/vars.yml
+++ b/dev-tools/ansible/inventories/scigap/production/pga_config/gatech/vars.yml
@@ -20,16 +20,15 @@
 
 ---
 pga_repo: "https://github.com/apache/airavata-php-gateway.git"
-git_branch: "master"
 user: "pga"
 group: "pga"
 doc_root_dir: "/var/www/portals/georgia-tech"
 vhost_servername: "gatech.scigap.org"
-vhost_ssl: False
+vhost_ssl: true
 # TODO: have Ansible manage these files as well
-#ssl_certificate_file: "/etc/letsencrypt/live/hpcgateway.gsu.edu/cert.pem"
-#ssl_certificate_chain_file: "/etc/letsencrypt/live/hpcgateway.gsu.edu/fullchain.pem"
-#ssl_certificate_key_file: "/etc/letsencrypt/live/hpcgateway.gsu.edu/privkey.pem"
+ssl_certificate_file: "/etc/letsencrypt/live/gatech.scigap.org/cert.pem"
+ssl_certificate_chain_file: "/etc/letsencrypt/live/gatech.scigap.org/fullchain.pem"
+ssl_certificate_key_file: "/etc/letsencrypt/live/gatech.scigap.org/privkey.pem"
 
 ## Keycloak related variables
 tenant_domain: "{{ gateway_id }}"
diff --git a/dev-tools/ansible/inventories/scigap/production/pga_config/georgiastate/vars.yml b/dev-tools/ansible/inventories/scigap/production/pga_config/georgiastate/vars.yml
index 447368d..018cc1c 100644
--- a/dev-tools/ansible/inventories/scigap/production/pga_config/georgiastate/vars.yml
+++ b/dev-tools/ansible/inventories/scigap/production/pga_config/georgiastate/vars.yml
@@ -20,7 +20,6 @@
 
 ---
 pga_repo: "https://github.com/apache/airavata-php-gateway.git"
-git_branch: "master"
 user: "pga"
 group: "pga"
 doc_root_dir: "/var/www/portals/georgia-state"
diff --git a/dev-tools/ansible/inventories/scigap/production/pga_config/hubzero/vars.yml b/dev-tools/ansible/inventories/scigap/production/pga_config/hubzero/vars.yml
index b2bbecd..cffe8e3 100644
--- a/dev-tools/ansible/inventories/scigap/production/pga_config/hubzero/vars.yml
+++ b/dev-tools/ansible/inventories/scigap/production/pga_config/hubzero/vars.yml
@@ -20,7 +20,6 @@
 
 ---
 pga_repo: "https://github.com/apache/airavata-php-gateway.git"
-git_branch: "master"
 user: "pga"
 group: "pga"
 doc_root_dir: "/var/www/portals/{{ gateway_id }}"
diff --git a/dev-tools/ansible/inventories/scigap/production/pga_config/interactwel/vars.yml b/dev-tools/ansible/inventories/scigap/production/pga_config/interactwel/vars.yml
index 205f5b1..5081d27 100644
--- a/dev-tools/ansible/inventories/scigap/production/pga_config/interactwel/vars.yml
+++ b/dev-tools/ansible/inventories/scigap/production/pga_config/interactwel/vars.yml
@@ -20,16 +20,15 @@
 
 ---
 pga_repo: "https://github.com/apache/airavata-php-gateway.git"
-git_branch: "master"
 user: "pga"
 group: "pga"
 doc_root_dir: "/var/www/portals/{{ gateway_id }}"
 vhost_servername: "interactwel.scigap.org"
-#vhost_ssl: true
+vhost_ssl: true
 # TODO: have Ansible manage these files as well
-#ssl_certificate_file: "/etc/letsencrypt/live/nexttdb.sciencegateway.scigap.org/cert.pem"
-#ssl_certificate_chain_file: "/etc/letsencrypt/live/nexttdb.sciencegateway.scigap.org/fullchain.pem"
-#ssl_certificate_key_file: "/etc/letsencrypt/live/nexttdb.sciencegateway.scigap.org/privkey.pem"
+ssl_certificate_file: "/etc/letsencrypt/live/interactwel.scigap.org/cert.pem"
+ssl_certificate_chain_file: "/etc/letsencrypt/live/interactwel.scigap.org/fullchain.pem"
+ssl_certificate_key_file: "/etc/letsencrypt/live/interactwel.scigap.org/privkey.pem"
 
 ## Keycloak related variables
 tenant_domain: "{{ gateway_id }}"
@@ -61,5 +60,5 @@ portal_email_username: "pga.airavata@gmail.com"
 portal_email_password: "{{ vault_portal_email_password }}"
 #portal_theme: "gsu-gateway-theme"
 #portal_theme_repo: "https://github.com/SciGaP/gsu-gateway-theme"
-portal_title: "InterACTWEL Gateway"
+portal_title: "InterACTWEL Science Gateway"
 ...
diff --git a/dev-tools/ansible/inventories/scigap/production/pga_config/iugateway/vars.yml b/dev-tools/ansible/inventories/scigap/production/pga_config/iugateway/vars.yml
index 510193d..033e037 100644
--- a/dev-tools/ansible/inventories/scigap/production/pga_config/iugateway/vars.yml
+++ b/dev-tools/ansible/inventories/scigap/production/pga_config/iugateway/vars.yml
@@ -20,7 +20,6 @@
 
 ---
 pga_repo: "https://github.com/apache/airavata-php-gateway.git"
-git_branch: "master"
 user: "pga"
 group: "pga"
 doc_root_dir: "/var/www/portals/iugateway"
diff --git a/dev-tools/ansible/inventories/scigap/production/pga_config/iugeosurvey/vars.yml b/dev-tools/ansible/inventories/scigap/production/pga_config/iugeosurvey/vars.yml
index 8e820c7..224c5a2 100644
--- a/dev-tools/ansible/inventories/scigap/production/pga_config/iugeosurvey/vars.yml
+++ b/dev-tools/ansible/inventories/scigap/production/pga_config/iugeosurvey/vars.yml
@@ -20,7 +20,6 @@
 
 ---
 pga_repo: "https://github.com/apache/airavata-php-gateway.git"
-git_branch: "master"
 user: "pga"
 group: "pga"
 doc_root_dir: "/var/www/portals/{{ gateway_id }}"
diff --git a/dev-tools/ansible/inventories/scigap/production/pga_config/lsu/vars.yml b/dev-tools/ansible/inventories/scigap/production/pga_config/lsu/vars.yml
index d7bd5fb..88a5ee3 100644
--- a/dev-tools/ansible/inventories/scigap/production/pga_config/lsu/vars.yml
+++ b/dev-tools/ansible/inventories/scigap/production/pga_config/lsu/vars.yml
@@ -20,7 +20,6 @@
 
 ---
 pga_repo: "https://github.com/apache/airavata-php-gateway.git"
-git_branch: "master"
 user: "pga"
 group: "pga"
 doc_root_dir: "/var/www/portals/lsu"
diff --git a/dev-tools/ansible/inventories/scigap/production/pga_config/mines/vars.yml b/dev-tools/ansible/inventories/scigap/production/pga_config/mines/vars.yml
index 0efb9e5..99ecb22 100644
--- a/dev-tools/ansible/inventories/scigap/production/pga_config/mines/vars.yml
+++ b/dev-tools/ansible/inventories/scigap/production/pga_config/mines/vars.yml
@@ -20,7 +20,6 @@
 
 ---
 pga_repo: "https://github.com/apache/airavata-php-gateway.git"
-git_branch: "master"
 user: "pga"
 group: "pga"
 doc_root_dir: "/var/www/portals/{{ gateway_id }}"
diff --git a/dev-tools/ansible/inventories/scigap/production/pga_config/nanoconfinement/vars.yml b/dev-tools/ansible/inventories/scigap/production/pga_config/nanoconfinement/vars.yml
index eadf2fa..ca3b297 100644
--- a/dev-tools/ansible/inventories/scigap/production/pga_config/nanoconfinement/vars.yml
+++ b/dev-tools/ansible/inventories/scigap/production/pga_config/nanoconfinement/vars.yml
@@ -20,7 +20,6 @@
 
 ---
 pga_repo: "https://github.com/apache/airavata-php-gateway.git"
-git_branch: "master"
 user: "pga"
 group: "pga"
 doc_root_dir: "/var/www/portals/nanoconfinement"
diff --git a/dev-tools/ansible/inventories/scigap/production/pga_config/nanoshape/vars.yml b/dev-tools/ansible/inventories/scigap/production/pga_config/nanoshape/vars.yml
index cf35720..60eec0d 100644
--- a/dev-tools/ansible/inventories/scigap/production/pga_config/nanoshape/vars.yml
+++ b/dev-tools/ansible/inventories/scigap/production/pga_config/nanoshape/vars.yml
@@ -20,7 +20,6 @@
 
 ---
 pga_repo: "https://github.com/apache/airavata-php-gateway.git"
-git_branch: "master"
 user: "pga"
 group: "pga"
 doc_root_dir: "/var/www/portals/nanoshape"
diff --git a/dev-tools/ansible/inventories/scigap/production/pga_config/newmexicostate/vars.yml b/dev-tools/ansible/inventories/scigap/production/pga_config/newmexicostate/vars.yml
index e9d8080..a544f44 100644
--- a/dev-tools/ansible/inventories/scigap/production/pga_config/newmexicostate/vars.yml
+++ b/dev-tools/ansible/inventories/scigap/production/pga_config/newmexicostate/vars.yml
@@ -20,7 +20,6 @@
 
 ---
 pga_repo: "https://github.com/apache/airavata-php-gateway.git"
-git_branch: "master"
 user: "pga"
 group: "pga"
 doc_root_dir: "/var/www/portals/new-mexico-state"
diff --git a/dev-tools/ansible/inventories/scigap/production/pga_config/nexttdb/vars.yml b/dev-tools/ansible/inventories/scigap/production/pga_config/nexttdb/vars.yml
index 5558a4a..446aed4 100644
--- a/dev-tools/ansible/inventories/scigap/production/pga_config/nexttdb/vars.yml
+++ b/dev-tools/ansible/inventories/scigap/production/pga_config/nexttdb/vars.yml
@@ -20,7 +20,6 @@
 
 ---
 pga_repo: "https://github.com/apache/airavata-php-gateway.git"
-git_branch: "master"
 user: "pga"
 group: "pga"
 doc_root_dir: "/var/www/portals/{{ gateway_id }}"
diff --git a/dev-tools/ansible/inventories/scigap/production/pga_config/nsg/vars.yml b/dev-tools/ansible/inventories/scigap/production/pga_config/nsg/vars.yml
deleted file mode 100644
index b4d5d0d..0000000
--- a/dev-tools/ansible/inventories/scigap/production/pga_config/nsg/vars.yml
+++ /dev/null
@@ -1,63 +0,0 @@
-#
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
----
-pga_repo: "https://github.com/apache/airavata-php-gateway.git"
-git_branch: "master"
-user: "pga"
-group: "pga"
-doc_root_dir: "/var/www/portals/nsg"
-vhost_servername: "nsg.scigap.org"
-vhost_ssl: True
-# TODO: have Ansible manage these files as well
-ssl_certificate_file: "/etc/pki/tls/certs/nsg_scigap_org_cert.cer"
-ssl_certificate_chain_file: "/etc/pki/tls/certs/nsg_scigap_org_interm.cer"
-ssl_certificate_key_file: "/etc/pki/tls/private/nsg.scigap.key"
-
-## Keycloak related variables
-tenant_domain: "{{ gateway_id }}"
-admin_username: "nsgadmin"
-admin_password: "{{ vault_admin_password }}"
-oauth_client_key: "{{ vault_oauth_client_key }}"
-oauth_client_secret: "{{ vault_oauth_client_secret }}"
-# With Keycloak, we have to have static role names
-#user_role_name: "airavata-user"
-oidc_discovery_url: "https://iam.scigap.org/auth/realms/{{ tenant_domain }}/.well-known/openid-configuration"
-
-auth_options:
-  - name: "NSG"
-    oauth_grant_type: "password"
-oauth_callback_url: "https://{{ vhost_servername }}/callback-url"
-
-gateway_id: "nsg"
-# relative to document root dir
-experiment_data_dir: "{{ user_data_dir }}/nsg"
-gateway_data_store_resource_id: "gf4.ucs.indiana.edu_61552681-96f0-462a-a36c-a62a010bffc6"
-#gateway_data_store_ssh_public_key: ""
-
-## Portal related variables
-super_admin_portal: "false"
-admin_emails: "['sgg@iu.edu']"
-portal_email_username: "pga.airavata@gmail.com"
-portal_email_password: "{{ vault_portal_email_password }}"
-#portal_theme: "base"
-#portal_theme_repo: ""
-portal_title: "NSG SciGaP Admin Portal"
-...
diff --git a/dev-tools/ansible/inventories/scigap/production/pga_config/nsg/vault.yml b/dev-tools/ansible/inventories/scigap/production/pga_config/nsg/vault.yml
deleted file mode 100644
index ff3757a..0000000
--- a/dev-tools/ansible/inventories/scigap/production/pga_config/nsg/vault.yml
+++ /dev/null
@@ -1,18 +0,0 @@
-$ANSIBLE_VAULT;1.1;AES256
-66366162363437656663343039353465613733666638633233376638656534396638316539383961
-6433376137366666393738373033333861613035356466360a333732333636336435613161313838
-66383236643764663630636338636539623234613132303534373933616432353038646432663137
-3438333536363832310a393438666439356230393063386433323863303231386431333638306134
-37313334623830356338643266306662363465383436333835353535333766363736393366353539
-35633837376266363232646233636539323565306164613264303033363061323636343638313238
-65633438323931336662633734303037636131373936643564343364323937343933383434663464
-31333163646436346431306235386231656266623565376366353335373061343264313163336262
-37613935666635653730636530366138303162633235386562373261363865373961616130323062
-62653735313362653637313136313462383233333464363135663064363232306461343964393434
-30383933323865333064366561363931396461633930343266346333616133346138613239396163
-35633035396539633963636231633036353137393835333439366539323438386164346530326466
-38633161303963323632376261373965323436343936656230663837333366663262636132626566
-33356663356365386162313138623736393062396262666465323735323265623639613163353033
-65633866646631643433643934323939346263313734363935306662326635386534376333646238
-30653135663939393235633133623063643430396232353239633939306234373632306463306335
-3161
diff --git a/dev-tools/ansible/inventories/scigap/production/pga_config/oiitandy/vars.yml b/dev-tools/ansible/inventories/scigap/production/pga_config/oiitandy/vars.yml
deleted file mode 100644
index 8f1c80b..0000000
--- a/dev-tools/ansible/inventories/scigap/production/pga_config/oiitandy/vars.yml
+++ /dev/null
@@ -1,65 +0,0 @@
-#
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
----
-pga_repo: "https://github.com/apache/airavata-php-gateway.git"
-git_branch: "master"
-user: "pga"
-group: "pga"
-doc_root_dir: "/var/www/portals/oii-tandy"
-vhost_servername: "scigw.oii.org"
-vhost_ssl: True
-# TODO: have Ansible manage these files as well
-ssl_certificate_file: "/etc/letsencrypt/live/scigw.oii.org/cert.pem"
-ssl_certificate_chain_file: "/etc/letsencrypt/live/scigw.oii.org/fullchain.pem"
-ssl_certificate_key_file: "/etc/letsencrypt/live/scigw.oii.org/privkey.pem"
-
-## Keycloak related variables
-tenant_domain: "{{ gateway_id }}"
-admin_username: "admin"
-admin_password: "{{ vault_admin_password }}"
-oauth_client_key: "{{ vault_oauth_client_key }}"
-oauth_client_secret: "{{ vault_oauth_client_secret }}"
-oidc_discovery_url: "https://iam.scigap.org/auth/realms/{{ tenant_domain }}/.well-known/openid-configuration"
-
-auth_options:
-  - name: "OII Science Gateway"
-    oauth_grant_type: "password"
-  - name: "CILogon"
-    oauth_grant_type: "authorization_code"
-    oauth_authorize_url_extra_params: "kc_idp_hint=cilogon"
-    logo: "/assets/cilogon-logo-24x24-b.png"
-oauth_callback_url: "https://{{ vhost_servername }}/callback-url"
-
-gateway_id: "oiitandy"
-# relative to document root dir
-experiment_data_dir: "{{ user_data_dir }}/oii-tandy"
-gateway_data_store_resource_id: "gf4.ucs.indiana.edu_61552681-96f0-462a-a36c-a62a010bffc6"
-gateway_data_store_ssh_public_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDW1N6Y2UJul9Y9Nd1jO6j+huPBzOm8uKCMgo7njslDS0WQEXB8+JZ+krZr3PTIWNl9KcRKkrQi86ufzxSImS1fdCIAtNsp3VWZ2hOU4G4h20K9wdSXsi3ppeOveruYqpBHfGwXhDflS0bsof6uRdmQR7nCa5hrVjGuntcs1DKdHSsrxfhc/4w7py7Ema5v32ZvCXYe0s3JpMR3Sd6zCsQBEw84GUGdz6f7K6CjxRuJlWOikbKttrSq+P1tstIdKIX1XxAnuvsbzJhWtJDvtGviQMiokW7SnZQ1KglrmG2R9CIteDhttLOAI5XL1hDL/gK78LSQ7sbF1i1PV+R7yPYt"
-
-## Portal related variables
-super_admin_portal: "false"
-admin_emails: "['techmail@oii.org','sgg@iu.edu','it-alert@oii.org']"
-portal_email_username: "pga.airavata@gmail.com"
-portal_email_password: "{{ vault_portal_email_password }}"
-portal_theme: "oii-gateway-theme"
-portal_theme_repo: "https://github.com/SciGaP/oii-gateway-theme.git"
-portal_title: "OII Science Gateway"
-...
diff --git a/dev-tools/ansible/inventories/scigap/production/pga_config/oiitandy/vault.yml b/dev-tools/ansible/inventories/scigap/production/pga_config/oiitandy/vault.yml
deleted file mode 100644
index dcd9abc..0000000
--- a/dev-tools/ansible/inventories/scigap/production/pga_config/oiitandy/vault.yml
+++ /dev/null
@@ -1,18 +0,0 @@
-$ANSIBLE_VAULT;1.1;AES256
-66303062353239373136623564613835386337646633393161363766316235623838613835346336
-3633623936346532626365623365656565323465376139390a356636656134616462303935326432
-30393838363534656535366161623734383439336464623335376533626135383637623334376436
-6562643233303566370a366631343464306561386564396534393635393561646532613037303930
-61336636353663646239363233363266383630613363316132383266383635666433653662663763
-35633462393238326237333935663364633066333762333031323034323730383934633831643530
-34393935313831303035616238643235343937353663656664346665366634313137323830373363
-65323633663066303130306634383164343838313363313765316139373034663736336665656433
-66643862303838623365386639623765383431316539366463316531663039313235643331356432
-63636234306666353134333532326535646461366165353339656634313239306439633131643166
-30626335663834343762353739353934643834326532653033313737613933346561613537393030
-34626464613962323661356536333732656137646138333332366337346533386234666465656361
-32376534306630613534626566626363343066383231363732666464333130623865653434363066
-32323038653364333335646638373733613065343266323964346466306633366138616363363764
-36663464373834313933356331613663373336386131643335643433366332323337613061326535
-64363234316335303639313433616661383631353033663133633631323037613136663431363066
-3732
diff --git a/dev-tools/ansible/inventories/scigap/production/pga_config/oscer/vars.yml b/dev-tools/ansible/inventories/scigap/production/pga_config/oscer/vars.yml
index 01592c5..25af92c 100644
--- a/dev-tools/ansible/inventories/scigap/production/pga_config/oscer/vars.yml
+++ b/dev-tools/ansible/inventories/scigap/production/pga_config/oscer/vars.yml
@@ -20,7 +20,6 @@
 
 ---
 pga_repo: "https://github.com/apache/airavata-php-gateway.git"
-git_branch: "master"
 user: "pga"
 group: "pga"
 doc_root_dir: "/var/www/portals/oscer"
diff --git a/dev-tools/ansible/inventories/scigap/production/pga_config/pfec-hydro/vars.yml b/dev-tools/ansible/inventories/scigap/production/pga_config/pfec-hydro/vars.yml
index 26750ea..a192466 100644
--- a/dev-tools/ansible/inventories/scigap/production/pga_config/pfec-hydro/vars.yml
+++ b/dev-tools/ansible/inventories/scigap/production/pga_config/pfec-hydro/vars.yml
@@ -20,7 +20,6 @@
 
 ---
 pga_repo: "https://github.com/apache/airavata-php-gateway.git"
-git_branch: "master"
 user: "pga"
 group: "pga"
 doc_root_dir: "/var/www/portals/{{ gateway_id }}"
diff --git a/dev-tools/ansible/inventories/scigap/production/pga_config/phasta/vars.yml b/dev-tools/ansible/inventories/scigap/production/pga_config/phasta/vars.yml
index ba633d5..8b0de66 100644
--- a/dev-tools/ansible/inventories/scigap/production/pga_config/phasta/vars.yml
+++ b/dev-tools/ansible/inventories/scigap/production/pga_config/phasta/vars.yml
@@ -20,16 +20,15 @@
 
 ---
 pga_repo: "https://github.com/apache/airavata-php-gateway.git"
-git_branch: "master"
 user: "pga"
 group: "pga"
 doc_root_dir: "/var/www/portals/phasta"
 vhost_servername: "phasta.scigap.org"
 vhost_ssl: True
 # TODO: have Ansible manage these files as well
-ssl_certificate_file: "/etc/pki/tls/certs/phasta_scigap_org_cert.cer"
-ssl_certificate_chain_file: "/etc/pki/tls/certs/phasta_scigap_org_interm.cer"
-ssl_certificate_key_file: "/etc/pki/tls/private/phasta.scigap.key"
+ssl_certificate_file: "/etc/letsencrypt/live/phasta.scigap.org/cert.pem"
+ssl_certificate_chain_file: "/etc/letsencrypt/live/phasta.scigap.org/fullchain.pem"
+ssl_certificate_key_file: "/etc/letsencrypt/live/phasta.scigap.org/privkey.pem"
 
 ## Keycloak related variables
 tenant_domain: "{{ gateway_id }}"
diff --git a/dev-tools/ansible/inventories/scigap/production/pga_config/r-hpc/vars.yml b/dev-tools/ansible/inventories/scigap/production/pga_config/r-hpc/vars.yml
index d368428..e4d8e63 100644
--- a/dev-tools/ansible/inventories/scigap/production/pga_config/r-hpc/vars.yml
+++ b/dev-tools/ansible/inventories/scigap/production/pga_config/r-hpc/vars.yml
@@ -20,7 +20,6 @@
 
 ---
 pga_repo: "https://github.com/apache/airavata-php-gateway.git"
-git_branch: "master"
 user: "pga"
 group: "pga"
 doc_root_dir: "/var/www/portals/{{ gateway_id }}"
diff --git a/dev-tools/ansible/inventories/scigap/production/pga_config/rutgersgemr/vars.yml b/dev-tools/ansible/inventories/scigap/production/pga_config/rutgersgemr/vars.yml
index 871b0ee..f0e1cd3 100644
--- a/dev-tools/ansible/inventories/scigap/production/pga_config/rutgersgemr/vars.yml
+++ b/dev-tools/ansible/inventories/scigap/production/pga_config/rutgersgemr/vars.yml
@@ -20,7 +20,6 @@
 
 ---
 pga_repo: "https://github.com/apache/airavata-php-gateway.git"
-git_branch: "master"
 user: "pga"
 group: "pga"
 doc_root_dir: "/var/www/portals/{{ gateway_id }}"
diff --git a/dev-tools/ansible/inventories/scigap/production/pga_config/saverx/vars.yml b/dev-tools/ansible/inventories/scigap/production/pga_config/saverx/vars.yml
index cd04ffb..fbde022 100644
--- a/dev-tools/ansible/inventories/scigap/production/pga_config/saverx/vars.yml
+++ b/dev-tools/ansible/inventories/scigap/production/pga_config/saverx/vars.yml
@@ -20,7 +20,6 @@
 
 ---
 pga_repo: "https://github.com/apache/airavata-php-gateway.git"
-git_branch: "master"
 user: "pga"
 group: "pga"
 doc_root_dir: "/var/www/portals/{{ gateway_id }}"
diff --git a/dev-tools/ansible/inventories/scigap/production/pga_config/scigap/vars.yml b/dev-tools/ansible/inventories/scigap/production/pga_config/scigap/vars.yml
index b5b42f9..43c3b3c 100644
--- a/dev-tools/ansible/inventories/scigap/production/pga_config/scigap/vars.yml
+++ b/dev-tools/ansible/inventories/scigap/production/pga_config/scigap/vars.yml
@@ -20,7 +20,6 @@
 
 ---
 pga_repo: "https://github.com/apache/airavata-php-gateway.git"
-git_branch: "master"
 user: "pga"
 group: "pga"
 doc_root_dir: "/var/www/portals/scigap"
diff --git a/dev-tools/ansible/inventories/scigap/production/pga_config/sdstate/vars.yml b/dev-tools/ansible/inventories/scigap/production/pga_config/sdstate/vars.yml
index 235abe7..2b11119 100644
--- a/dev-tools/ansible/inventories/scigap/production/pga_config/sdstate/vars.yml
+++ b/dev-tools/ansible/inventories/scigap/production/pga_config/sdstate/vars.yml
@@ -20,7 +20,6 @@
 
 ---
 pga_repo: "https://github.com/apache/airavata-php-gateway.git"
-git_branch: "master"
 user: "pga"
 group: "pga"
 doc_root_dir: "/var/www/portals/{{ gateway_id }}"
diff --git a/dev-tools/ansible/inventories/scigap/production/pga_config/seagrid/vars.yml b/dev-tools/ansible/inventories/scigap/production/pga_config/seagrid/vars.yml
index f7e58d7..1139c65 100644
--- a/dev-tools/ansible/inventories/scigap/production/pga_config/seagrid/vars.yml
+++ b/dev-tools/ansible/inventories/scigap/production/pga_config/seagrid/vars.yml
@@ -20,7 +20,6 @@
 
 ---
 pga_repo: "https://github.com/apache/airavata-php-gateway.git"
-git_branch: "master"
 user: "pga"
 group: "pga"
 doc_root_dir: "/var/www/portals/{{ gateway_id }}"
diff --git a/dev-tools/ansible/inventories/scigap/production/pga_config/searchingSRA/vars.yml b/dev-tools/ansible/inventories/scigap/production/pga_config/searchingSRA/vars.yml
index 3118f6a..d89a5a9 100644
--- a/dev-tools/ansible/inventories/scigap/production/pga_config/searchingSRA/vars.yml
+++ b/dev-tools/ansible/inventories/scigap/production/pga_config/searchingSRA/vars.yml
@@ -20,7 +20,6 @@
 
 ---
 pga_repo: "https://github.com/apache/airavata-php-gateway.git"
-git_branch: "master"
 user: "pga"
 group: "pga"
 doc_root_dir: "/var/www/portals/{{ gateway_id }}"
diff --git a/dev-tools/ansible/inventories/scigap/production/pga_config/simvascular/vars.yml b/dev-tools/ansible/inventories/scigap/production/pga_config/simvascular/vars.yml
index ec37727..307dc1a 100644
--- a/dev-tools/ansible/inventories/scigap/production/pga_config/simvascular/vars.yml
+++ b/dev-tools/ansible/inventories/scigap/production/pga_config/simvascular/vars.yml
@@ -20,7 +20,6 @@
 
 ---
 pga_repo: "https://github.com/apache/airavata-php-gateway.git"
-git_branch: "master"
 user: "pga"
 group: "pga"
 doc_root_dir: "/var/www/portals/simvascular"
diff --git a/dev-tools/ansible/inventories/scigap/production/pga_config/southdakota/vars.yml b/dev-tools/ansible/inventories/scigap/production/pga_config/southdakota/vars.yml
index a43b98c..7b1b127 100644
--- a/dev-tools/ansible/inventories/scigap/production/pga_config/southdakota/vars.yml
+++ b/dev-tools/ansible/inventories/scigap/production/pga_config/southdakota/vars.yml
@@ -20,7 +20,6 @@
 
 ---
 pga_repo: "https://github.com/apache/airavata-php-gateway.git"
-git_branch: "master"
 user: "pga"
 group: "pga"
 doc_root_dir: "/var/www/portals/southdakota"
diff --git a/dev-tools/ansible/inventories/scigap/production/pga_config/southernillinois/vars.yml b/dev-tools/ansible/inventories/scigap/production/pga_config/southernillinois/vars.yml
index 163790f..2d06199 100644
--- a/dev-tools/ansible/inventories/scigap/production/pga_config/southernillinois/vars.yml
+++ b/dev-tools/ansible/inventories/scigap/production/pga_config/southernillinois/vars.yml
@@ -20,7 +20,6 @@
 
 ---
 pga_repo: "https://github.com/apache/airavata-php-gateway.git"
-git_branch: "master"
 user: "pga"
 group: "pga"
 doc_root_dir: "/var/www/portals/southernillinois"
diff --git a/dev-tools/ansible/inventories/scigap/production/pga_config/testdrive/vars.yml b/dev-tools/ansible/inventories/scigap/production/pga_config/testdrive/vars.yml
index c0c974b..fc77076 100644
--- a/dev-tools/ansible/inventories/scigap/production/pga_config/testdrive/vars.yml
+++ b/dev-tools/ansible/inventories/scigap/production/pga_config/testdrive/vars.yml
@@ -20,7 +20,6 @@
 
 ---
 pga_repo: "https://github.com/apache/airavata-php-gateway.git"
-git_branch: "master"
 user: "pga"
 group: "pga"
 doc_root_dir: "/var/www/portals/testdrive"
diff --git a/dev-tools/ansible/inventories/scigap/production/pga_config/uab/vars.yml b/dev-tools/ansible/inventories/scigap/production/pga_config/uab/vars.yml
index 991719c..8c041c8 100644
--- a/dev-tools/ansible/inventories/scigap/production/pga_config/uab/vars.yml
+++ b/dev-tools/ansible/inventories/scigap/production/pga_config/uab/vars.yml
@@ -20,7 +20,6 @@
 
 ---
 pga_repo: "https://github.com/apache/airavata-php-gateway.git"
-git_branch: "master"
 user: "pga"
 group: "pga"
 doc_root_dir: "/var/www/portals/alabama-birmingham"
diff --git a/dev-tools/ansible/inventories/scigap/production/pga_config/ultrascan/vars.yml b/dev-tools/ansible/inventories/scigap/production/pga_config/ultrascan/vars.yml
index b643a73..dd1e55a 100644
--- a/dev-tools/ansible/inventories/scigap/production/pga_config/ultrascan/vars.yml
+++ b/dev-tools/ansible/inventories/scigap/production/pga_config/ultrascan/vars.yml
@@ -20,16 +20,15 @@
 
 ---
 pga_repo: "https://github.com/apache/airavata-php-gateway.git"
-git_branch: "master"
 user: "pga"
 group: "pga"
 doc_root_dir: "/var/www/portals/{{ gateway_id }}"
 vhost_servername: "ultrascan.scigap.org"
 vhost_ssl: True
 # TODO: have Ansible manage these files as well
-ssl_certificate_file: "/etc/pki/tls/certs/ultrascan_scigap_org_cert.cer"
-ssl_certificate_chain_file: "/etc/pki/tls/certs/ultrascan_scigap_org_interm.cer"
-ssl_certificate_key_file: "/etc/pki/tls/private/ultrascan.scigap.key"
+ssl_certificate_file: "/etc/letsencrypt/live/ultrascan.scigap.org/cert.pem"
+ssl_certificate_chain_file: "/etc/letsencrypt/live/ultrascan.scigap.org/fullchain.pem"
+ssl_certificate_key_file: "/etc/letsencrypt/live/ultrascan.scigap.org/privkey.pem"
 
 ## Keycloak related variables
 tenant_domain: "{{ gateway_id }}"
diff --git a/dev-tools/ansible/inventories/scigap/production/pga_config/utah/vars.yml b/dev-tools/ansible/inventories/scigap/production/pga_config/utah/vars.yml
deleted file mode 100644
index 1f097df..0000000
--- a/dev-tools/ansible/inventories/scigap/production/pga_config/utah/vars.yml
+++ /dev/null
@@ -1,65 +0,0 @@
-#
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
----
-pga_repo: "https://github.com/apache/airavata-php-gateway.git"
-git_branch: "master"
-user: "pga"
-group: "pga"
-doc_root_dir: "/var/www/portals/utah-university"
-vhost_servername: "cybergateway.chpc.utah.edu"
-vhost_ssl: True
-# TODO: have Ansible manage these files as well
-ssl_certificate_file: "/etc/letsencrypt/live/cybergateway.chpc.utah.edu/cert.pem"
-ssl_certificate_chain_file: "/etc/letsencrypt/live/cybergateway.chpc.utah.edu/fullchain.pem"
-ssl_certificate_key_file: "/etc/letsencrypt/live/cybergateway.chpc.utah.edu/privkey.pem"
-
-## Keycloak related variables
-tenant_domain: "{{ gateway_id }}"
-admin_username: "adminuser"
-admin_password: "{{ vault_admin_password }}"
-oauth_client_key: "{{ vault_oauth_client_key }}"
-oauth_client_secret: "{{ vault_oauth_client_secret }}"
-oidc_discovery_url: "https://iam.scigap.org/auth/realms/{{ tenant_domain }}/.well-known/openid-configuration"
-
-auth_options:
-  - name: "Utah Science Gateway"
-    oauth_grant_type: "password"
-  - name: "CILogon"
-    oauth_grant_type: "authorization_code"
-    oauth_authorize_url_extra_params: "kc_idp_hint=cilogon"
-    logo: "/assets/cilogon-logo-24x24-b.png"
-oauth_callback_url: "https://{{ vhost_servername }}/callback-url"
-
-gateway_id: "utah"
-# relative to document root dir
-experiment_data_dir: "{{ user_data_dir }}/utah-university"
-gateway_data_store_resource_id: "gf4.ucs.indiana.edu_61552681-96f0-462a-a36c-a62a010bffc6"
-gateway_data_store_ssh_public_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCiR1OU3jrSqoDxkieAQuB4YXnEllg+74h9nWKXSa7G6S8BDuSOVQl6YFdk1nCpJ9pGEoCziYa+fgTmQ98eXFEaXglRyu2Cq7HkPgKnBR5xtsx+Qslm/jBxO2C/kez7eGJH8F8bSOq6o4hUsPP8XUdzvf76o+wZ25RErqzQl1Go8E1sOi4fXkH4eR8cCsI093ZquuUgwIZjoqcj+bwCRoZWCqyOhXEzYqZmng4EvBm3VnPf77xdVxAZELDd7oKiTf4y1cEExIJyQJqwCJJjic9Utuf13lEROfnV2nELf1YdaLwWoFKJgc+bBaoxxxoo1hdKW7hFQDmgHCWASSIX0fx/"
-
-## Portal related variables
-super_admin_portal: "false"
-admin_emails: "['sgrc-iu-group@iu.edu','Anita.Orendt@utah.edu']"
-portal_email_username: "pga.airavata@gmail.com"
-portal_email_password: "{{ vault_portal_email_password }}"
-portal_theme: "utah-sciencegateway-theme"
-portal_theme_repo: "https://github.com/SciGaP/utah-sciencegateway-theme.git"
-portal_title: "Utah Science Gateway"
-...
diff --git a/dev-tools/ansible/inventories/scigap/production/pga_config/utah/vault.yml b/dev-tools/ansible/inventories/scigap/production/pga_config/utah/vault.yml
deleted file mode 100644
index 53202b9..0000000
--- a/dev-tools/ansible/inventories/scigap/production/pga_config/utah/vault.yml
+++ /dev/null
@@ -1,18 +0,0 @@
-$ANSIBLE_VAULT;1.1;AES256
-65613637666134636439323035313837633838666438643936636166643164346263613739323234
-3061643239626362666534366664613736353831376162610a303261353766333862393432613139
-66336330373036326632633935306362333130383331393736326134616231623465363161373565
-3934643930323833310a326266616534626135393934303261386432376634346633653933623963
-66303035393830656339376131363264633064356135393036636334653038356363323730636361
-32666636333966613432633439653935353632623035623263633766363763323239303037633236
-37306239346239323465386537663033393534363865306531326534396133356565396464326537
-34326261343133306435323063626330366464386461653539666666623430333164646533393832
-38323032386133626466626531653532363332373062383761313562346433353761373333616531
-30636566353636303730653062616162313130366561626537613036646662366665353436343735
-34643839323633616135333562326233303336333332613239643239636236333533643164353931
-39613833653864386331396539323563643630383261303465663333343466626639323362313332
-63323663663536373030623461303966396331643564353335633739353838393531346139663965
-61353339343162653736393062343430396635373765663035373464333463333237653134346634
-36313065306264616162366333663461333662396235373661616230623666353662343961636664
-62663966343564666631643161616463353836323566363131653838656665653436363963386166
-6363
diff --git a/dev-tools/ansible/inventories/scigap/production/pga_config/wvsu/vars.yml b/dev-tools/ansible/inventories/scigap/production/pga_config/wvsu/vars.yml
index d8d3dda..584a1bc 100644
--- a/dev-tools/ansible/inventories/scigap/production/pga_config/wvsu/vars.yml
+++ b/dev-tools/ansible/inventories/scigap/production/pga_config/wvsu/vars.yml
@@ -20,7 +20,6 @@
 
 ---
 pga_repo: "https://github.com/apache/airavata-php-gateway.git"
-git_branch: "master"
 user: "pga"
 group: "pga"
 doc_root_dir: "/var/www/portals/{{ gateway_id }}"
diff --git a/dev-tools/ansible/inventories/scigap/stagingnew/files/airavata.jks b/dev-tools/ansible/inventories/scigap/stagingnew/files/airavata.jks
deleted file mode 100644
index 4124c40..0000000
--- a/dev-tools/ansible/inventories/scigap/stagingnew/files/airavata.jks
+++ /dev/null
@@ -1,76 +0,0 @@
-$ANSIBLE_VAULT;1.1;AES256
-32656330396637356236343162313734356339656337633933323238656630646566366533646333
-3139613434336665386532326136353266373839376563630a313865376639663637643130386364
-65313436343330303437613639653833333530383130383266643963336334373366353062393762
-6534303635313039320a643139666331343435303037356139663235613437653235326666396132
-38376233343461656232353963306362383435323061623164623135613538376161656533306464
-64613637303666323439306466666266363764306133346132393931383631393964363864343037
-31353737323039303961643933316164653635326333633930343665616135646338386661316231
-31303462366239326664326139353433343232363061363464356236353938343338306562363864
-30616137343539656237303030343863613432646366383232396262373538663030666332303061
-38383630613535663332323830303130313039393430656666316361383335326164393138393062
-37663535326533333239613364656638313239663365353261633934656132633732333332366337
-35613733666466363662633363633530376133663436653462656538346134353965303561643031
-65376462663964323137356264303831383933303862393435313633333337303635336133613932
-35356439326431353932333839643433326430653638626231663733326464643338323639656334
-31363433656163643136396132633766343937313331363537353930643331346135643663373535
-65343164313065396634636330626130643165336365663166343035363238316630626433653032
-65323561366363366561396562346533653135623565666166373230303862376463316637313734
-39373166626633626266306538373138303131343665316165346530363061656130333739363865
-31326631316130306331353034306663643531646635373638356164613333353536356634346236
-30663034613936303861636561633761663335326534393236646633333261663136643831396637
-62326135646265306662336239326363613736323162633933326636303536633263323437373262
-63393438623834626337626438393332353838316336666136663364353431623530653633626561
-66646238323238643963653162323136636265396333313236626632353237393565363462633734
-33666533303132306563346538393433663161623832613065346136376532343131383830353438
-65306235336534313733393238646235616366383035303566616330633437393132363262316337
-38626135626537353664376133323466373939323638616630633538663533313061373763373535
-33343564623963613336396463333361383534333735353261353639373435393466346131356562
-33366262376533393161613932343938396136663532373231626362356663386263613332323539
-38613666356430653537326663303331613431353434663737323935326566656461653630306436
-66393337323938373030616563373639623665653332643335653861643034346239666337336132
-31663463343530313964303232633662383535313436626361313236653466353538313663636235
-31316261323134646639383865613434643762346562323337333662306162333936373863656135
-35666462653631366136623137613131333962363030646531396366633030666632376439373036
-35393932633333653535363266626665363662663237303766666332326161306666333061646231
-37626637653365343962653336326332353739333664393831653132636431656439633134383139
-64363035353236333835393932616263346334346162376261643931396137656338373437643736
-37643364616264306531616534396332303932636336656434376663393265636135346262346562
-36633833393265356530646633343866646635643932336430363634313237363637653965633438
-32323534383164376563323136666533373338333766343663326566613364636136303461393232
-65306635326663633836386166383564363832356166616439373833346561623436373635393533
-34393930393764393363363330646161346331376636666132656662626434353338343861373964
-66633561396338306339393665633565643366666130643235613732626637643133656465316264
-37306230323665343730363761643637336665313437366366346139643137313165623339663436
-61663863366134666163616438326639636132643331613265353831383134356133376131333538
-30663132306633646264333931656233613039353830363135396364383730663133313730323739
-38336537663830333466663033653361636332303534356630333730303731613539633635636230
-33326233663763653039303131656437326361306537396130353162373333616339363930363637
-38333963306235333837303361386332383762306130393338373034633334313835613565623865
-32333330616337656566346231393636363061326364633136626539313634396337636661313838
-34636464303863636639666231363965316336646461383234656161663035366330643039386266
-62343564353835386637626165663438353739386538326463303832633765323563383036386437
-32633065303532303631356236383862316563346237653562393033623035636431343138646237
-62386463353862643865333836613938653561316335366563323338643834616634383361346162
-61343436356638333965396238623639303631386363373432323032636139633962366262316438
-33313065653130366235613133303130306362623133386239323637626561643536653830663038
-36363463313838366461626639636139616462336335373438613230663536346332656436653235
-61316439343731646631663133393065313462643230643162313462343365656431363438613933
-65343032653038633330653734356439353537363236343163623138333836663862383035373537
-31626136363232666362613036366536323533386534366264636131656362373963643137333830
-34373039653939313863303736643761376332313161343232323863323832313631366138396661
-64323638383532333263316132303538376631396637656463366430343865633061363636373834
-33373163376239356433373230323561343830326434316661346433323233353933313632666533
-63626130393866653866656231386532373461346236653363653338396165663431383438386166
-63636230643439626337386638613662646636326435313937623334333933303431653335663333
-35313935613034353865383633643334333865386262353632353632383933636161343638303033
-66373037353435386263396664333335323932616137653839323133323032386265306562393561
-64643831353835366365623531626661626466366563666431396233396634353731613033376265
-65366231653562393233386231333435366438663932393962326464666161643666303932306132
-35383338333533343133636662316635343531303535383237653866353563623333333838383138
-33333439383661666637306531313865343164653633323962346430653762386230313035336664
-63336634633434346164313664613539613832643939633331643132363232396637376234353539
-32653136363135646431376131373632353363383239303536343865373632366337333261353935
-34323466396430363830303332376434343534623037613862323732336566623366333861373134
-64373535336133616537613362646164366237343433363838663731353961376538346534646337
-373637313538306332616430383839623432
diff --git a/dev-tools/ansible/inventories/scigap/stagingnew/files/airavata_sym.jks b/dev-tools/ansible/inventories/scigap/stagingnew/files/airavata_sym.jks
deleted file mode 100644
index 13ccf1b..0000000
--- a/dev-tools/ansible/inventories/scigap/stagingnew/files/airavata_sym.jks
+++ /dev/null
@@ -1,30 +0,0 @@
-$ANSIBLE_VAULT;1.1;AES256
-66393935613465373265366662383133353632633262353839623837636364373339336564636265
-3862663231313565313064643833646530636361333866610a636266666561306263343632663734
-33306432363830323132653038326139323464393065313631373936346162386161626461396530
-3061376439346264310a346630616535326435626235393564643062326665313239373839336331
-38316134613764373336333338323263356563396638303932656562336538333137643131373366
-35653334383566313262336261623339626532333634363531313534353762356534643961646338
-34633938333436333135643736663437373532633061366464343632643366343337366262386465
-33373333333033303262316566346565613731633361333438363063616165333231323635646333
-34303463656431663932326464356332353235336238653462663463373332656231373562626664
-65346131663064376232643435653264383465323761373063366162663236323935373139386138
-39623734643064623635376261646465383663613238623531613066306464326662346532346365
-63623064383436303634393639316638366136653563663930303130643531373166613133653338
-36636433626539366661656164613032653931356561336336343561323962336462383164393463
-65353265363535616136306136353064346561666439663532626234363763653535663061386232
-61663566343361666634346134623538366664396236346365336431383937653761643235613661
-32373439656332306536623336343763386364363265306138356138616464656662363434636531
-30646163333462636236336532383964643234616131663465666663633333343366376134666263
-63353161336366613065303434656537396237643938376233333431663232356630373038333835
-37306162623439323062626532656633646138386131643037323566643264653432633735333362
-65613564393232393433646334376639356564376661663430353630626534336566663061303632
-64633235333463626435323134636333353536393936663539663539336233363934333931323961
-63313739333733613465376334336239306633636136383831396533326530616133373366653531
-33356137656636323037303430623065393930633731346634346161633334313362613136313138
-36633835353665626462363031653161646530366339363732373865343136356637326631386437
-30383235306538303261613262376634303164313862366330393463346261363866346336666136
-37333566396436383534633330316465306461383537616661343265663731363561323137303164
-36336532333233343463633064346162646562613332646331343931363838333739636335376331
-66626436313938346362303932336339636434666665373862306462646162393066303338383265
-64363138663564386332383032366265666565643633393236663830313936343637
diff --git a/dev-tools/ansible/inventories/scigap/stagingnew/files/client_truststore.jks b/dev-tools/ansible/inventories/scigap/stagingnew/files/client_truststore.jks
deleted file mode 100644
index 14967c6..0000000
--- a/dev-tools/ansible/inventories/scigap/stagingnew/files/client_truststore.jks
+++ /dev/null
@@ -1,271 +0,0 @@
-$ANSIBLE_VAULT;1.1;AES256
-64633034313166666666623461646364636632383263633530376634393163333761373434306533
-3639626636363865633166323833353366313038646133370a613834663831326166346465363264
-30363732323133616361653331366436333836333664383262393636393039336138623033336634
-3038366662626538660a656130396630343131633762356665323166616164353366623830373833
-39333438336339663136353438396137396163633862326331663139333938636162613935623565
-62626661343661363238646166373236396463663235626561346332656533363137633966623032
-30363933663636633031373062396637373661613333646438616234306232333864636336343761
-63386532663733333237356363653061326531396366613139653634373761623131383363323364
-65653165386265626538646662636630323763323931383533346531386536636335313037316333
-31643930363836396433353139646161613936643537343232376637613766656632636235356636
-63626634336635333630363565643362383835356462323238653866353633353836306637326635
-35303062333162396238303362653235376464623666366431393565663034643238616333333836
-63626237396236353130663237623064303965346463383666373636663266373335386634333164
-65616538626135623232653135383162353631333535373662356432646633613662383636363230
-33306238303963663462626537333463643436316665383761613131373163316433343033383263
-30626462323038616138343039323765306333333639636564386532356265396562306239653863
-63353231653434613365363835303661333035383061343531333065623039643034313965356164
-34393165303034333465613565333062393532323462633037626365653265643535373466373262
-36636533653363353634366632303465643264383361333432643835316666363531626539363835
-61613665643139396536653037336365343835313932396232656237333135323139353333643764
-36353730666630323862333136623164396137306234386435323465646436373539653037333838
-38383931626266633636663361633662313636616338396132623538323164303462663062343233
-63313862353265333435303531616566633364313830623537373539353162396635623861646334
-61643630383562636637613865386563663331326336653938393336346263316237343065303733
-64613134376165623538353233626363366461386538613437303662386533396462646639646166
-37366338343235623365353565343534396165346162666366313839343331633032663936316336
-39613336623137363831653131323662366438366465616332636635343562326433303531653835
-38386530343066393066333639326464346361336632626261333933653739626562393439636536
-66343931343364313861346232346131336162363164653230313339323162356338623863303336
-66616436323233343133373531393832313761373034376430313633366135666437376236363863
-34636635316466646534636437616566373263636237656665303963303866303839353534326661
-34343163396336376131343362326134643463353631633537613636643966356630663861383337
-64663830353135616661323239633333643363643136643335623363313061393730383534313338
-31633336323632346333343763626262666431316262636234373235383164663361366132393763
-31383766343334393733373166346236366239663630393436616562396336653930373161623132
-31326237396363373365363363333136333263343663326266643066656132366132663934663434
-61323837633731633038613335396161376639393334303064346132333764323035323730393536
-38323266323062306261323862316431373534386363323932353138326139633837316663663965
-39323935326432326438356132353139643166353862656132623539313266306665366134363430
-34393262323832396165323935613433636562396638626436346261656561633166343932316637
-31323764353733616166393964633763303761623536343561373665323134663862383462613363
-65633332316131666134303163363237323865346339313730343935656131623861306638336333
-37353735383133306231376666393530373464386362633839363861363964626134306533623234
-36396336656564616139333761363332326265343732663934666434643765616566376438616565
-62316462323334393332623263313737346636636162633637386134356635363862333539633438
-66373738366238326665336262396362303938616266343839663634393530643137636130646261
-61333231356538316463623462623964623635653738643030366136363231333665633138333435
-32633334393861623364643334323763336663666137646232643834663230623435653730613936
-34663633666433663834343038663739666562353837646466343035366264316435333932343839
-32666137626339393163306237653266656230346639303062636332376334636237616436343261
-30363764316539643139323035626436326532626435303134653936386334666664633230633163
-30353831353939333637656330306335366331336136363530663437373033346436383534363463
-38303834396136336464663338373964313739363839373330373834636331316134643632373061
-64383633363739623966313836383566336133316538323165323462623431353934643061636532
-31356165393138626434373532323862333333323238366138316263346438326466653638323163
-63326632366233646430366330336363303336656362613463613263613337376232633062333661
-62616532323735633563376430633130326538303365393262653264663665383437353466663731
-65626130393637333731616131663337373236643534366430326232393363663535353937663939
-37323133383732663564623934323430613633333631656235323632633935666432633238633032
-66326638646263623332616234363965656439656466613361656561326538616338343935393763
-61663564366161663737306466316338616332323637613331633137323939373963656633353433
-65376665386662376139326465316437643931396666636436633335643733663532336361326461
-37623933313863353432643338643330643832346133633537653737643866336233643333363439
-39313237333263376638623963633138333535393537376661333965623263303531376636626565
-62613331313739666464643766363961616164363830653262656535623266313739643462393639
-36623830616166626266643362356262666365323733666363326361646662306565356263346538
-64653564363664666566373130363432313439386465303031363130613935363233613337623933
-32646462313035626531343964393138616162616532323162626665396533303438623064363966
-36356437316662363231383037396564386235326535393266633063386535356361653861366161
-32626462353138306534316631303836363534326531323536626166393231623137313065333638
-38613636366539653766623231623838333265663366373163363061333461663731646639373631
-39303237613734616339386239366461343132663064393266336138363763633337356330326464
-61356233373666363830636335313632373039363464616233366334363063653730656230636337
-32363930303463613930303463366662333761316335373065633761343631376137393936353866
-37633439653734376336306236373265386530623232383931343065346266663166653166623334
-65646465316562366264333933663930663836626137313836623462666637313439356430616365
-39363563393938366630656538386632653465663037613339383138393461353330383234336236
-39616461666335336538623536613765386336623766373032616533316438663136663565326265
-33323830653039636161633362393761313331623362326566656237633333323166316166643866
-65643862373733666231313633363934333139373932316531663364323863353066326362386634
-64613234373337393561343636363831653232323135396432666134316336393030363364376138
-66343361376331643061366435303461343462616331613730663138316364323164313566653630
-34323236656132353537323764373161303635626533623538303335383565393763336630393031
-64656464363432636462623063353531343733336664356261623138326331666533313033653630
-31626536386561653732383637643962386363393035313335643937326534303264373163323761
-65343861633631336233366337613761373333363038366165366362373138616362336633616161
-65643862366634316432333536353531623234623636353465333434313932643465663533623665
-62316130643963613837363337623237386230663931383662353662303931336563383465376265
-34353264343765333632306130313265386638336532633837303231326339643035666534303238
-62646165396133353038366165633338376538623331623532333738333035306235613561633834
-61613137383565336164323732383565663237303435313830613330333166636163656665613561
-31656232626530316232346338333663646638636637396636393366373865373737383734393032
-33633333346265393930353030353465376336343835343763386633383236316162346433343265
-32663338636364356661303663653965393232326361333665333139316636323466643031346432
-35646239333634343731366135333365383662636430386465613730663430316231343838643530
-33636535623532653939643039663565326561373436336166306634383336386230666463383666
-62386665376264393762396162663035616263326165333936303431376238353739363236326665
-34623263336363313765623032306630646664643339643538396437663330356232306661393133
-61656235326336643563643566336136303338376232313630396436336134396330633466346235
-39313838353166356262663464656364643136633766363836313730376235383663396638306132
-32653930366236613966326461353030646232313034336464663764376265333334376265333335
-35323061323366636534373566303836623864333630333163663263303831363164323138373063
-37663138636264323430366662616564636363386432623636316337336538643263333765303937
-61666130623462343864653930386435643833366339653064663463663633303632646438336533
-31313831373631303863393463336430666365353865353665306265663433366333656532393264
-33303733656165383830646433313236373131653463653366313537396638623263643934333535
-32666534353230353763343861663432386438323132396664303064366263353336663430623438
-39643733326464333437643138303065323132396539353830353538366633323232396265616439
-33616261643765393762366633373435663230386630323533643662656562643637633637316561
-36323432663164373661333037663866663535316365333361643565316337623332396136386661
-30306238313532366264393565383130323230353034663165316239313637343235306339383930
-33303461633033313064343266383333333633326236396236373933323035396536316439306438
-38626538336138666464326432323438316632653430373438653365663432343564393165646337
-35393462643737323433353963396664656233643264366635366365303235623661333733376538
-66383234323235393763326239346664623066373133643835343664623132313535366563326663
-37396434366637386433663831353636373037633837353634663332363430326261373064346231
-34646633363639373536643261363763393831653536386231636532336438306661663264653764
-64313961623862306333646634663238656433373338363238313162393736303362623538316238
-31623431323735616562336365333136666566626264313437313639613035316538656136376631
-37363665636566386531306533323634333037656637656365666539363933326662313934623535
-33353932353533636665663862373031653662653766636537663533643066613637656462663163
-37643436393862363939363831626338353536393333303632316335313830326639633738313733
-63383032313561646234383762393065666134323735393433643336313861376437363131656235
-36663439643539626430306435303337386236353332343238653035366439323738613035363337
-30613262323431623266616565653639626165656266623065333362646433376365386233376161
-36653731333562386635626265363566383332623231633730323836343135376539373963333964
-39326363633939353763386461393036313634623636623535643336626230643362613265623735
-62633865393966373338386132663534633636616163333364323433616535396363356638303033
-35373436393238303963653164313739353564306537646534306366343461653734613735336662
-66323065373930333937306431313831353564663363373461663835656464396538303935643134
-30393562653736616135613433373866626662623030616134343063396262316464633739666634
-35613361303734643436333163373630343035623663323564656661326364316162636130626263
-35343561353534313537626663363363386433373531323731363531626537656436633532383564
-64653936653763373532626335306237653434376532393364383233663334373935373336303233
-34343337643765393231313030313830323661363736303664663532346537616530373365393434
-33383361303664613465333737306534623337306433303236663139646664653438343438353734
-38376331393039326666303839613034663537653532376461393435326131363238363766633730
-31636139616464376630666166613335343938306566353037616531383337333065616438323534
-63336433313130313863656239393161306161623231333238323835313064643365333937363464
-66376635363761396364626431666433656263633235373331666634346566386662643137656365
-61373365636361326161306266663639646232393138646231396365626661646631383039376535
-65663530663165373665653361626638383565386166306432343135303131336331613161383537
-37666532323835376438326463646338346630653664643165656463303166653638663165306662
-39636331393434363339666461323665306337306665306339303665313865393364666339373136
-37383564396239333832353735393331386132363838633836653461626538623664643032316431
-64666130333432363636633932616562646632303263633233386338353262633864356261646232
-34396262336665313533326163616563633734653738373861643862616237636565663432626135
-39336639363734383533346633306534306334313135383837356431383236633031323338363565
-32393030633835333962333839313134343431383331306237656362376166303165393631653135
-34353363656463373664663631313834616664643831646261633834323532333633626564623366
-37346231343364303832626663626239313534616331356563313132383666386138346437363238
-61303962613438323938636134326433643934383931633165343366323431316134613739373164
-37656435393866393035363330326330393034316264623130666132373865356130626366343464
-31383035323533643961633830383264613164366631383065316361393761363763643166653561
-31646364656130323163623565623665636663313566363731653837393932383630633263613736
-61373832353534326332353364626132653830383439616238306638326535346632386334396664
-30623539376230623464373465646231393661333039333936313731346466373939323733656536
-35303063323065613337663931653566393562303039653232376635376166353161383162663539
-38383235363061613537616163386634396466626365346363376434383364396430613565373430
-31356166336532623461396134656137646361336462343838356236343231336530656435643639
-64343432666166386566333635633233666337316535333164353566636465396635633131663838
-32653432346132346435613738336161373333343665373534613764643733306233326433376233
-65356562393532613730376130396366653931616235346132336138336233303966643430326338
-66353331336531373439626135373833393166306439656263633061663565396232313266303062
-30363761396162616235386234386533316334613239343638323635326235653661393965633865
-62623834343435326437363537626265383163666632333636343630303038316237356265366238
-39653832343164663064353135646132333963623038303962343665616430393836303435383266
-66343438313834353633643033633533353062633139623933653234323562383037616434383337
-66366465633731396332336465646431393861353535316438313336313931306337636364373166
-36663264313938643531616635333363663362643166363530363533373232386363383537326438
-39343435303431633966643464346134643832633335633836383237396232393238303563616438
-65336234366432323438356465376431376266363035613363363333323333643631643932613335
-33633732616432646336346439336133363338383934633166303633656131666466623639653237
-32643030343262386132363364366661653331346530663331623661393134356566646331616233
-38313262626132643236306664626561343665616161663533643065363065663136373035653039
-36636163366538613036343535646339663462666531316537306238653730303566626363363665
-64336333393763313436343538653461303036313631323230333634663336346434363039613539
-31656537313230373534383334386665366436366534366336656163396631643534643963326561
-39613866343363663831356565663533663363653263353639373665626261383236326236633663
-37373936633339666634633235333433633561346566613236356362366263623266346239616532
-38323264386534633439393161663839333931623035306365336563343032386461306162383234
-31653865356135636237343662333433646630306136633232663632363063313838373233303234
-36313637396536633561343539333866623637393234353436306666633536343231663334663037
-64303064336236303061316333643432373665326637363938336266373130386165643331326633
-39663364336530326538346230376564346437636365363939363963323934356262353963356339
-31613735396462396336346164326266393135316335656635656666383830313438623333633336
-62363661646664326435316234656264616237323533666333643431646436303464376236376263
-34316137313165656136386562393138613164356136613132626563353930653964616361643837
-31363239386131666366626331316461613462313661316564616237336238616661393065363366
-36643830306431386430633532353734353539393162336535643764323466353561373538376138
-38373939646665626139313636366463613430356238313837643236666535666639636539663437
-34666266363537386130376565383262363232333333326632303730323834366539613132643262
-65353264633836616161316534633666383261346563383634343961646438343139346538376637
-30313163373339363166636436333064376134643264653839633636383636613138356662383063
-39613235626232356534316535613135643238663932653136363964616536306531623539363263
-31653062306166323562316439343332373162653636373063643163303836366162306464303739
-32656461666361306536383935666665613562616662636532613962643238313264353639393837
-33333965313034646535663531346465353236393730336266383535396563353233393032653731
-64373930363164376264313530306235643637323932336531393731316563643330363663393737
-36313733316462626231666139393533346462353132653339343065366563656433356262366232
-64316533316133333963336236313034353932633761393332663261333838653236386665633533
-62396631623138353165323664613630396333616638396636366665336236396537656132636361
-65616439396437333561313061323434323432663963373033386433323339383562393561653965
-61653765323033363836303536356262356461666666376438646434323166393963646661343135
-63323463346464616136623538623733663864633532363339313066643230623338653432326430
-61303662343836356331343335653639313735616664623234643665316439396332393565336561
-32626634653933353233613537333338306632316461326466356334363330633031333964316166
-35366538613931653963393234353632346535336638656162396366616335386661373334376338
-65646133393839353162306463376665346164333364346337616539383865633930666261366237
-39616530613631303531663831643534333163643834656434343766663661626539653631386165
-64633539373737623534356638653232613862663632633431633832316333633339663065323731
-66663331663263386132346435393864613536393837636338303662626537613532386162623761
-37306164313838643432353930623433363066646336656662666264346366396262343634333036
-32643636666231303563386334623537373932656261616466386431346237336562333465343039
-64373736306464316131326339663630353063386662376538333263363937643965663665646537
-38363462666638643663363566316532396464323331373230363136386631306133313236663739
-30376137643365643637663033343431313835306663333764666630363233666561333532353835
-35623035383365376166653634303233313265646431633438323535323565396230616337393534
-30353232633437646631363662373832623464353666383365396164316265376630616236636131
-32623463643831333061653061663262616233656535373236326330303763643735393231373366
-30633634636161633630663262393864346236306663396335613433333066626237313739333538
-63313062396232383562666339623231346531333338313463316139383263613039633331343532
-36353533616336383764643836613838373563323031376465643062303836336439396264313230
-34303135396431643466373366333533646630663134313261313134333531313034643531326331
-64313062653335633837353466626465396638383738366337363332303761353465353263383538
-65316165383830623162326633376635306335366337333831386261393764393934396431343534
-32613331646431623130623362613233623737363062396332313464346334336135316163626330
-65326137643033653966373865303831333965363034663262383962353737346465613166323865
-33656533656264396561316635663738343835363739386539366435353739363964613232373235
-35623964353433613765343232643639346261396263303062636139623164623164666266346535
-39336633623338396461343661346362363533376433353261393964323262653231333533633163
-63303165636337306434333465386232323630653139653339356231323166306466646336613036
-33653236363764623565643462623531383330633763623861613937363262316130323837353461
-66653036376132653662613264316666623936353761316235663235366566373761346137393132
-38393238636462626238333962303231323062616437313865333463396430343937663130386466
-35343166303936343239306364383566626164393964616235653164326434653839366365623565
-35303637313537666438613136343563613230316638633034653332353639343037666638313333
-30613631303638336430393063346635313236303937366534376631373939656462383330323861
-32363732636665653166333134306538373630323965363364383734393061363961616166663338
-65623530633131626330323531353939383066643330623861343337363365396634613732623233
-33633463663764383366343934306237333561646237336232626238613139343431653764363339
-31343430646532336137663465653336636531316565616639353265393632653932313465646235
-32353635616438346235643761623732323730383665393633616336323362636633383165636166
-36353634366235316330333038346336643562663862613465366635353731613130343034326463
-30393335353032396264343336326361633966333531653766366637643864656563613635373838
-33646533313366373137353838306133643636346630316233393138643062393034353831333862
-36336564653734303366333937656635636264386363383937323663383337343039613437626234
-33666133653739643238333736616239343766316134636635373239396233663939666262303530
-37343434333536643435643437363137656665623266333430616363613361643064363365383137
-65386230303136636165326137336139623030306438386565616132383866623733663063313530
-34326562353564653930363063346330666162663431306662333834666636616435346630366333
-61366539613065393964363136396435656430613761646136313735343335313933366162366430
-63646636623232336634373036353862633665376462666339633339393138333339386333363837
-61356636393764653238303239343939373161373662373932363635316162386362653935613430
-39336139653964383332363664326130656637363335313661633434646231393532623732353065
-37343861633263323334323239616665643735633432623765313963386165376634393033383239
-35666366356365633935623737373762653362656630333438336433383363303064396437353763
-63373438623063626630623231393434666163343364313132336563666565393839633330333064
-66363839326161653733633266313730383332396235386136383335636434316463363932633330
-33643566656539376330633935383638376362623965323632626331613362626232343063393632
-64366233653565393466336138616163353962323536333833653832656333646330393466366332
-61333935613032343865346663346134653062393537636231346261653037633337376566653336
-63353234636134623238613231303763326265326466316462343438633534666636356161383865
-30326637643961353333346361316266383264343139373536393763383462626164366339643063
-65636462353933616262303261373963633064346634343539646232633235653661343630366265
-61343764356530623438643732666263626233333265326334313739343230663538363734306634
-62666637346433643035373134313337663161663031633239313637373836393766643763383932
-64656239663931366232346161653538336362386533383764356262666531316539366163333062
-32353437303731613861373764376364353838653064313938373839343935383431363364343731
-3561613134383664386436353033343565666232633534333463
diff --git a/dev-tools/ansible/inventories/scigap/stagingnew/files/keycloak.jks b/dev-tools/ansible/inventories/scigap/stagingnew/files/keycloak.jks
deleted file mode 100644
index 44b438c..0000000
--- a/dev-tools/ansible/inventories/scigap/stagingnew/files/keycloak.jks
+++ /dev/null
@@ -1,143 +0,0 @@
-$ANSIBLE_VAULT;1.1;AES256
-30366331303865323462333764326263383166393537356230336538633135666336653666363561
-3035643264363462633734326562643336653866653938380a653634333866326130316234623037
-32353361323362356365353661353537663765633731633436303362383962383234303839393831
-6630653035646262300a316134613233396332653739313736333265373435633839393662366462
-37653633333637666365363364616635363362353239633636626636633139666232363432386232
-34313861323064656262303165363134336432373135613565623935623863396136336136336263
-66363762323031323861663066343330663462623338383735613063616235626437613930313236
-35656530363932373433356136636563366336383936346234303563386138616665396364326330
-62303731333364313631343032643230626161613063613861383035366630396339633031353662
-35393535366130373037663062323138333365383037656537333963393066613365643563323832
-37363037663765333135663534396338653934383665623633653537316562636136633065343365
-39363263353333363562633337343361343134663666396630626332636539343939643066383538
-61303362663865373866373363643538386638663531333537656432303137343334393630656436
-30393232316332663038366537386535336565626538643661616433646431323936393530656639
-36343866666265626663653330633438666461313137393662353638346539376334366634616630
-64356237383836333638623337396633653162616564616561306238643663383636323865383736
-32653031383536383732643238316465666331323033373038636330663266353530356337343739
-37663734613365653130396332383463623666653636376236626439613830633232343937303034
-35313563396566303134336131313837663332626639313162663636633737383164366136383836
-32633331333066356631393935623734343430666139613735656262333064346433613934366534
-65383533396466653065376338336636313338633934623734633136393635366636356436333233
-63386263323161646335353939656361333964373962633065343536663230626434396232303863
-33303832396665383233386434353738303135623637656663646631623539626633333336383464
-32373431633738383435323465303430356239336433316339363665613337396335633465366531
-39646137646235626235623032393863333864623634313835393966373965356133646336343231
-65346365656333333361383463303036306262383438383765653838373332643236633965356632
-30353239616566386334663936646531336135363838303064373536353663333433336664336133
-35343733323539653330386131353236626161666461303661613365313135626136626634663065
-66306239353932363435323662346334356430663338623561373937396338653331343830346432
-33353964363063383037376366646261306463336162396163323063643463366336333161393361
-33363736313436303938333062663065386531346332346366343036633435653037316639313538
-37363562393338353565356565366331313163653163323263346136343266313764356135656365
-64653839626562303736346166636464323038323937326561306439306364303865336639316639
-35313662623737326538393766616235396137663762323461613132623939393165616132303836
-30386232353463356266396537396336633166363037656665333361336533353637383738383137
-30636431643964373265636132343664363961303933646332646534376166363932373036653433
-32656263613863653131373137376661323939306235366162323165633863666333326637643437
-39656366363531633532663334393334333630373132653662656161313438326531663232343730
-39653838386266353561656632623365353161303730346263666436656239343230313262626566
-30333563623763636138363263656335373636383661626665373733663363346663396163313934
-35393432393863353632633366346264306363303861373435363164396436616535373432356434
-32643337623534386330353633393132383737353137646630386238323763313063653561636162
-66636438363838383136663931623664616434326639386535396437653562663732323936386634
-38373537306231313664313963303337666166353438393232646536366130303366333635393364
-36363031356461633662323730363536383631396566616661303031353735386234316265313366
-65356138323262633431623366303136356630616364303838663434626266643638346664333835
-38633732613234626637643335613463333661366337356365653036376664363339316465356564
-37393433633934323935386561663862396435316664396164363733613930333538316261613335
-39663538656166306630303136346563613131633931366531626166363564626361393564363531
-31383730666338386637313130333161383237636564363536363838366361306437323165363038
-32373964353134636665303865653263386230353132626361393337653365646565393262633961
-37623738663336303963356661356539346264383364343366613030393333623437323164343939
-35623534363663656331363734626163323834613861386630353230626630393932396532623634
-62316565303134616364363563343639643463666464656136396234376463386265653162333832
-38373630313966616230623831656230363333653664383137373234316134306165313630623466
-35363932333433323061336661363632336134643166326238653237323530303937646663363332
-65643339663130613131643665616361656464303034666264393264326531303561633730323337
-36636331386534626232393533376363333034343432306461303438663164623566323265663664
-65346161633538343931336365393661336661336363633430333033366466636639353466646334
-37353532343364363438616635636566376239393839666563346664393730326630313538626264
-32643039366266306130653231336132303239633531306439656335343262626665313933313064
-31313834646664383465346432633437303139636166663236313630633436623431316664353766
-36356462636538663339656131653038316564623831313830326137373333623331393430663236
-39613931363661316137316539356264663032366262333063653236346537346230653932663435
-31356439303461346236376432366664366363636633353963323537643264643361636632336333
-31383163366362343765386332346536313561386636393832393234643566636535666438646132
-64373039376333636465373131646661663538653664386335383834653132653266363461633064
-63663363376565336239323335646636376438653938316531643334636466633061646337343664
-61643037316437356363663033623638323064633530366534613132656137636537663333636133
-31663364623134396434313334313263363636343362653766653664623663653936646331343438
-62636661343965393033313339356539383233363430666563363764386336343839303633353633
-61613333376130633064633666626133383838303936303936633937653664656237313466346465
-30316564336164643864663062646564643839313330373230356166336534633765613031656535
-39663234356437383131383331356332656265306362636462366337306265316437363432323632
-35653261396530333862613565353161306237653065353431396465366164666462303532653136
-65303736646136336233623837633761373730623865316164343932623737666131663337636163
-39336335343432383639633830396134316434393764653235613737633435646238363537623632
-36616261333834613765303132656135316330643964313961646364343638636233316364373137
-35663630366431623665393064663634393734613339363863636164373764623734303531326534
-39663264343834623536366231366664346365396638336263313832366133623561303335386362
-34366632356166623163363230656339346337306531386636663434376231626135313763643134
-34626637346166303933383533653435323039373433646364383934623663363234316366353635
-32303739356638346539363134333037353830343735656162616230306439306634366631663635
-36343865333263656466633036386439653066336233656262383238303766356131383266303432
-63323336393237633131336238333263613464636266666466653333373365643435623936636464
-35343531386461333762383834323837353734616561623331306166653331616239333232383561
-31336430616137366664633737626266326339343836633033316632326438363434643565633738
-32623634643564633435633931376663643266663761643031333433616233323234663238323461
-32386235343533626331396531346634643566636539363161363133313436383638643266633436
-33353363636635353164306235353162313963653734383739323366666235333663373735393439
-33336337336365303030376430653535313833313337666235636331366462653731393631373030
-62616431336439623164333162393062363933316234383431313162666233363765353634346536
-35326164373332623138623038656263353665613230376438343861373337316237343833653361
-66303038613339633038313236363136646361386134343266303266333365373537623166333965
-61653363623263663231623765346232653037633863383331623038303964373131343532333266
-63346336633166393337343031366237363633323736323565633331376566356437323633653862
-33393263346237613739316536306366383863323065633738663337303265643038363838363263
-33393666316262383135366361316439376636333866643138613639306231643866663264373835
-37393731376330326633623931663261316337636338333733663766326264376436313136373734
-35363238303135323136383563656263383437386431666238346661363534333237613533646365
-34633862323537366338353138303063623032623136316338313533393430323233306437383363
-30663333356230343837366531346437633832333836343937346261303862343334363034333861
-38636130376466353066643065646339656637343464383439323263326536396139306235373033
-66656238363435356536326134336133663533383735616463333133613437346232393364633033
-63633432396231646165643634363535653336313833323434356331343132393866396339366434
-37613736303165313539333033613234646237336230613134643362366232336131616335393538
-64663361383466623831653265653461346665393264653533323466636666326565383163663465
-33623133636261633636346335306634306538623035356630666136636161306566666565313030
-63346231336565666366386565636361383465313833613836613432356431313637633837363866
-65333761636236316534656262383365303064393465636134383661323834393165643766626234
-61636539373966646262663231363031616333393033666565636336346561363261313564373736
-37646535613536616463663264623131656165646337616262396138333232383032383661303863
-66363936666364376539626135623463326439393664346261333530306563613137343736383365
-36366536343035326662633562396533366264336630613165346166313339306635353863663436
-36373539303064663932326562353166613432623364656535616132393431616332363635396638
-65616331333063636664353633376363366164636462393934383434663364333861636532633437
-64353337623939626437633436626665303436306338346337346535663439376163623861633864
-64326639626438373661383438623266303664356332653534393037343336343034376430616536
-32336362643630343464326138313662626533306437616138343036336639373161386437303161
-66393739393930663762616333643431373237633639666338633735353236663037373237646435
-37666537323662623431343833643161393932336662666538633765656432663761323865663436
-30623532343635633734663165396366616365313966386162666435633166316531323235653764
-32336537336539653331643734633564653863306630356639623936346336333131373731633536
-34653561636539326633323963376338326432633639306530616631646538383238646238333061
-38306432363535396239333634393739306664313931333864316464383430373065653132616166
-61626461396238326463616530663136313230663239333530643466653865346634613465313034
-64333330663831643130373038343935376265343366613363326638376433373139393664656264
-39393266643339366163323732333962353632323233366430346431643432383039323736656330
-33656334616330653563663966656438613965336638653234313831623864383463623866653761
-32326364386631616264663634656436316365303739663736626635393838643031383732383462
-35633861383163333163386163616439663165616533303064303434386134366631663062643462
-33646361376365666635343637343038313435613965623664646663316239323536633033613664
-39316237306166396132373566313166306361313565383937393338303764616230633534376338
-63383033306631396634616639356561613261356266613831653333626364643631666431633932
-65616132356163663261363630373738343565313230386639376364353739343364303835386664
-64313065616264343830313061303161313966643439643335626639656135626664366365633430
-38323332316462326531306639393638626565663339366331663935666134333231396235633134
-66316363343539666334323233393438646134626433373433383531626166353937633739343834
-62303133613735653961316139356165626365653665633439653363356663303732323038356233
-64386633363133393033343462643731333039396466386136363066663762353062313532646336
-65663263663063323030343338613331623035633763666535323966663432393065373734306464
-6234303833653065643264613135343731373634666632313938
diff --git a/dev-tools/ansible/inventories/scigap/stagingnew/group_vars/all/vars.yml b/dev-tools/ansible/inventories/scigap/stagingnew/group_vars/all/vars.yml
deleted file mode 100644
index 5647467..0000000
--- a/dev-tools/ansible/inventories/scigap/stagingnew/group_vars/all/vars.yml
+++ /dev/null
@@ -1,166 +0,0 @@
-#
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
----
-ansible_connection: ssh
-ansible_user: centos
-
-user: airavata
-group: airavata
-user_home: "/home/{{ user }}"
-
-# deployment related variables
-deployment_dir: "{{ user_home }}/master-deployment"
-airavata_source_dir: "{{ user_home }}/master-source"
-airavata_repo: "https://github.com/apache/airavata.git"
-airavata_dist: "apache-airavata-api-server-0.18-SNAPSHOT"
-airavata_dist_name: "{{ airavata_dist }}-bin.tar.gz"
-git_branch: master
-
-# Database related variables
-db_server: "{{ hostvars[groups['database'][0]]['ansible_default_ipv4']['address'] }}"
-db_server_port: "3306"
-db_user: "airavata"
-db_password: "{{ vault_db_password }}"
-mysql_root_password: "{{ vault_mysql_root_password }}"
-app_catalog: "app_catalog"
-exp_catalog: "experiment_catalog"
-replica_catalog: "replica_catalog"
-sharing_catalog: "sharing_catalog"
-workflow_catalog: "workflow_catalog"
-credential_store: "credential_store"
-profile_service: "profile_service"
-
-# Rabbitmq related vareables
-rabbitmq_server: "{{ groups['rabbitmq'][0] }}"
-rabbitmq_vhost: "master"
-rabbitmq_user: "airavata"
-rabbitmq_password: "{{ vault_rabbitmq_password }}"
-rabbitmq_port: "5672"
-rabbitmq_broker_url: "amqp://{{ rabbitmq_user }}:{{ rabbitmq_password }}@{{ rabbitmq_server}}:{{ rabbitmq_port }}/{{ rabbitmq_vhost }}"
-
-# Zoookeeper related variables
-zookeeper_client_port: 2181
-zookeeper_connection_url: "{{ groups['zookeeper'][0] }}:{{ zookeeper_client_port }}"
-
-# API Server related variables
-api_server_name: "apiserver-node0"
-api_server_host: "{{ groups['api-orch'][0] }}"
-api_server_port: "8930"
-api_secured: "false"
-tls_enable: "true"
-api_server_tls_port: "9930"
-enable_sharing: "true"
-iam_server_url: "https://iam.scigap.org/auth"
-iam_server_super_admin_username: "AiravataAdmin"
-iam_server_super_admin_password: "{{ vault_iam_server_super_admin_password }}"
-
-# Orchestrator  related variables
-orchestrator_name: "orchestrator-node0"
-orchestrator_host: "{{ groups['api-orch'][0] }}"
-orchestrator_port: "8940"
-api_orch_dir: "{{ deployment_dir }}/api-orchestrator"
-api_orch_log_dir: "{{ api_orch_dir }}/logs"
-
-# registry related variables
-registry_name: regserver-node0
-registry_host: "{{ groups['api-orch'][0] }}"
-registry_port: 8970
-#registry_dir: "{{ deployment_dir }}/registry"
-default_gateway: "default"
-
-# Credential and keystore related variables
-keystore_src_path: "{{inventory_dir}}/files/airavata.jks"
-keystore_passwd: "{{ vault_keystore_passwd }}"
-client_truststore_src_path: "{{inventory_dir}}/files/client_truststore.jks"
-client_truststore_passwd: "{{ vault_client_truststore_passwd }}"
-cred_keystore_src_path: "{{inventory_dir}}/files/airavata_sym.jks"
-cred_keystore_passwd: "{{ vault_cred_keystore_passwd }}"
-cred_keystore_alias: "airavata"
-cred_store_server_host: "{{ groups['api-orch'][0] }}"
-cred_store_port: "8960"
-keystores_location: "{{ deployment_dir }}/keystores"
-
-# Monitoring variables
-monitor_email_address: "scigap03jobs@scigap.org"
-monitor_email_password: "{{ vault_monitor_email_password }}"
-
-# PGA variables
-pga_repo: "https://github.com/apache/airavata-php-gateway.git"
-pga_git_branch: "master"
-user_data_dir: "/var/www/portals/gateway-user-data"
-real_user_data_dir: "/data/gateway-user-data"
-## Airavata Client related variables
-airavata_server: "tls://{{ groups['api-orch'][0] }}"
-airavata_port: "9930"
-airavata_profile_service_server: "{{ groups['api-orch'][0] }}"
-auth_verify_peer: "true"
-oauth_service_url: "{{ iam_server_url }}"
-
-# Sharing Registry related variables
-sharing_registry_host: "{{ groups['api-orch'][0] }}"
-sharing_registry_port: 7878
-
-# Profile Service related variables
-profile_service_host: "{{ groups['api-orch'][0] }}"
-profile_service_port: 8962
-
-# Keycloak
-keycloak_ssl_keystore_file: "{{ inventory_dir }}/files/keycloak.jks"
-keycloak_ssl_keystore_password: "{{ vault_keycloak_ssl_keystore_password }}"
-keycloak_db_host: "localhost"
-keycloak_db_username: "keycloak"
-keycloak_db_password: "{{ vault_keycloak_db_password }}"
-keycloak_master_account_username: "AiravataAdmin"
-keycloak_master_account_password: "{{ vault_keycloak_master_account_password }}"
-
-# Helix
-helix_version: 0.7.1
-helix_url: http://www-us.apache.org/dist//helix/{{helix_version}}/binaries/helix-core-{{helix_version}}-pkg.tar
-helix_dir: "{{ deployment_dir }}/airavata-helix"
-helix_cluster_name: "AiravataDemoCluster"
-snapshot_version: "0.18-SNAPSHOT"
-helix_controller_name: "helixcontroller"
-helix_participant_name: "helixparticipant"
-helix_pre_wm_name: "prewm"
-helix_pre_wm_load_balance_clusters: "false"
-helix_post_wm_name: "postwm"
-helix_post_wm_load_balance_clusters: "false"
-
-# Listening port for kafka installations
-kafka_listener_port: 9092
-kafka_rest_proxy_listener_port: 8082
-
-# Realtime Monitoring related variables
-realtime_monitor_broker_url: "{{ groups['kafka'][0] }}:{{ kafka_listener_port }}"
-realtime_monitor_broker_publisher: "RealtimeProducer"
-realtime_monitor_broker_consumer_group: "monitor"
-realtime_monitor_broker_topic: "helix-airavata-mq"
-
-# Variables related to the broker in which parsed job statuses are published
-job_monitor_broker_url: "{{ groups['kafka'][0] }}:{{ kafka_listener_port }}"
-job_monitor_broker_topic: "parsed-data"
-job_monitor_broker_consumer_group: "MonitoringConsumer"
-
-# Variables related to platform monitor
-platform_name: "Staging Environment"
-platform_monitor_email_address: "airavataplatformmonitor@gmail.com"
-platform_monitor_email_password: "{{ vault_platform_monitor_email_password }}"
-platform_monitor_target_email_addresses: "dimuthu.upeksha2@gmail.com,dwannipu@iu.edu"
diff --git a/dev-tools/ansible/inventories/scigap/stagingnew/group_vars/all/vault.yml b/dev-tools/ansible/inventories/scigap/stagingnew/group_vars/all/vault.yml
deleted file mode 100644
index 4efff11..0000000
--- a/dev-tools/ansible/inventories/scigap/stagingnew/group_vars/all/vault.yml
+++ /dev/null
@@ -1,35 +0,0 @@
-$ANSIBLE_VAULT;1.1;AES256
-32326532653963626434326231373439623237396363643165653230356533386166373431313939
-3131616564656133373730353234616439613730643766620a323637666366313063643333363438
-64303438393332666538383963626539393062386438646363656533323434346538376161363665
-3831356362343964300a343561663930363535366562313337663331376339306132323762383737
-39646638303462383862303366626134333330623938616231363538353837333231336162396134
-35656237313762363331643936376533313236393561333463636261373332343961646162663930
-38333965653535346262383936656361643364346632376439636261396131393531643861393561
-31303434333036636637303162343833336338326239623134646133666337333433313632643438
-62373733346437393334376235343933626162303631393037376638373566633734643333303265
-39333636626338633033626663663337643831666135316461663639613634303738613235646336
-37663766663636666630383236356335303137626633393934323537666261613662623534366464
-38333166613335653838393530636636303564313334326463363532623834323733613433316363
-64303762653330643037363433326639323561313539653930363538616331323961626231663836
-39366335666364623133313933636636366433303036653263383463303034333965373965636531
-36383438396563303938326438323431343835373935613162323766653437353664656566613665
-65373364636230376162333732346634613861356638646634323538316535396539333533303438
-32333364336561396365333365623936613963373932313735363738386430353263663434656339
-33366534376535346538633961623935663634393334316463313531346565363333316439353237
-64306161613339393037316361323362613431613761326266316135613732363831613031386235
-36346233643431636165336536306234393538616263636561626665343139303266353861393639
-35343462326563343533643564623765616537666466613935643166653831356565373762313265
-66363433306432343165643565393062333135343264666538356166653263353163313535643262
-30636566383730383935323434613338623964323733643435366333646430626337643165306235
-38613038333339376335623161373034666564623763643563323935333337343334346566626264
-32356232383933346266313232363164346333313130636566313631333234333762303835363663
-65646435333834363063343635316332623332336331643263386363633361643432616563346665
-35643231653635366661383630303965356364653634616534373165646434363331636165373863
-64636234323265623139313931613739663765326434633539613839343236333262393135656432
-39363465333339363738306665323562376338303230343032663334656439643064366430633134
-32333436363536336465386561626236643036353239306634313663343831393765313637393362
-39643332336562333639646631626633323437616630323832383661666537303461646563396663
-39346235376432303334393536313061333161656232343466386632303037386362306332663934
-66613230633064313834333538313565616534623130353766326661346338353233646162623963
-3238303031303061636337343034633335333439666165653433
diff --git a/dev-tools/ansible/inventories/scigap/stagingnew/hosts b/dev-tools/ansible/inventories/scigap/stagingnew/hosts
deleted file mode 100644
index be99908..0000000
--- a/dev-tools/ansible/inventories/scigap/stagingnew/hosts
+++ /dev/null
@@ -1,26 +0,0 @@
-# inventory file : scigap staging deployment
-
-[zookeeper]
-scigap07.sciencegateways.iu.edu ansible_user=root
-
-[rabbitmq]
-scigap06.sciencegateways.iu.edu ansible_user=root
-
-[database]
-scigap05.sciencegateways.iu.edu ansible_user=root
-
-[api-orch]
-scigap06.sciencegateways.iu.edu ansible_user=root
-
-[helix]
-scigap07.sciencegateways.iu.edu ansible_user=root
-
-[kafka]
-scigap07.sciencegateways.iu.edu ansible_user=root
-
-[pga]
-gf4.ucs.indiana.edu ansible_user=root
-
-# Using the same keycloak as production
-#[keycloak]
-#gf7.ucs.indiana.edu ansible_user=root
diff --git a/dev-tools/ansible/inventories/scigap/stagingnew/pga_config/NCSAIndustry/vars.yml b/dev-tools/ansible/inventories/scigap/stagingnew/pga_config/NCSAIndustry/vars.yml
deleted file mode 100644
index ea1e034..0000000
--- a/dev-tools/ansible/inventories/scigap/stagingnew/pga_config/NCSAIndustry/vars.yml
+++ /dev/null
@@ -1,64 +0,0 @@
-#
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
----
-pga_repo: "https://github.com/apache/airavata-php-gateway.git"
-user: "pga"
-group: "pga"
-doc_root_dir: "/var/www/portals/{{ gateway_id }}"
-vhost_servername: "ncsaindustry.scigap.org"
-vhost_ssl: false
-# TODO: have Ansible manage these files as well
-#ssl_certificate_file: "/etc/letsencrypt/live/csbglsu.scigap.org/cert.pem"
-#ssl_certificate_chain_file: "/etc/letsencrypt/live/csbglsu.scigap.org/fullchain.pem"
-#ssl_certificate_key_file: "/etc/letsencrypt/live/csbglsu.scigap.org/privkey.pem"
-
-## Keycloak related variables
-tenant_domain: "{{ gateway_id }}"
-admin_username: "admin"
-admin_password: "{{ vault_admin_password }}"
-oauth_client_key: "{{ vault_oauth_client_key }}"
-oauth_client_secret: "{{ vault_oauth_client_secret }}"
-oidc_discovery_url: "https://iam.scigap.org/auth/realms/{{ tenant_domain }}/.well-known/openid-configuration"
-
-auth_options:
-  - name: "NCSA Industry Gateway"
-    oauth_grant_type: "password"
-  - name: "CILogon"
-    oauth_grant_type: "authorization_code"
-    oauth_authorize_url_extra_params: "kc_idp_hint=cilogon"
-    logo: "/assets/cilogon-logo-24x24-b.png"
-oauth_callback_url: "http://{{ vhost_servername }}/callback-url"
-
-gateway_id: "ncsa-industry-gateway"
-# relative to document root dir
-experiment_data_dir: "{{ user_data_dir }}/{{ gateway_id }}"
-gateway_data_store_resource_id: "gf4.ucs.indiana.edu_61552681-96f0-462a-a36c-a62a010bffc6"
-gateway_data_store_ssh_public_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCajV9E/lBaAdpDecuhB2/Qv3losWr+zNVMwJcpq8ZPiWKA9AFJNT8TW3/VJC/RtrzVzmITMqJYOaQM5mPAOn5D6T7y2CvHxIFL5MktNc1dNiCXbg0nT+zQFirIGNskbs9xE5AWJDsNXOWj1Hjaffk80WjpRNvreXV3mrvdSi0BQYKxp0zIuXNgSR8/LjvYSWn+L/xhrP5eMYcOPlVsrkp1O7imeiib4je0ZNzsd6YXIfNhNoJIzod0AinpmM85zJ/OuemHePE0c4hiU7caOxhBiRxzNCSpN+IFLvo/l8txdnXP1nTwvahZtvVaxuj4OHEeaLSVU8CPxmwBGQEuN4AP"
-
-## Portal related variables
-super_admin_portal: "false"
-admin_emails: "['sgrc-iu-group@iu.edu','pamidigs@iu.edu']"
-portal_email_username: "pga.airavata@gmail.com"
-portal_email_password: "{{ vault_portal_email_password }}"
-#portal_theme: "gsu-gateway-theme"
-#portal_theme_repo: "https://github.com/SciGaP/gsu-gateway-theme"
-portal_title: "ncsa-industry-gateway"
-...
diff --git a/dev-tools/ansible/inventories/scigap/stagingnew/pga_config/NCSAIndustry/vault.yml b/dev-tools/ansible/inventories/scigap/stagingnew/pga_config/NCSAIndustry/vault.yml
deleted file mode 100644
index c1b12ff..0000000
--- a/dev-tools/ansible/inventories/scigap/stagingnew/pga_config/NCSAIndustry/vault.yml
+++ /dev/null
@@ -1,18 +0,0 @@
-$ANSIBLE_VAULT;1.1;AES256
-64343338333561333931383164666138363930373131376131303337613136653263623136646465
-3135386533316264663536663938666334356661656365630a336339343731636530653565393431
-63326565306433636533356230306265356162656638616434653330333566313338663238316436
-3461313130653030650a613832323336303532383938366239636533393961326131386633393435
-63326338383336363361316435313535623236303034653239303138656464303762316566643236
-61666662393464323766626632663964666561613230616235666262656331386433313433363435
-34303162643135656533623538396632356537316533313266653130666334666264303837366465
-37366665393031623038656565343631316335663261383866326634656238616234343236646165
-39386534353261626235623762303638643065666331363638636265656136393834613539396162
-61643738336633373464313434396539666638313162633132396566393564376231616336663536
-65343265393232306163323364313038646365306139663832653962343164313537306437316561
-63346136613665616664366561363332646531333532326639626136326538336263343636363964
-33643538326636386436633638663137383136303662666636396230663031356236623932313532
-36373264653863623662653939363736616334613365313135323537373262336662366338373439
-36613131613363363138353064613561633832343765666665383135313261633739383166666438
-66616165646661363761303666343435366632636334633833363063616536343865373831646238
-3436
diff --git a/dev-tools/ansible/inventories/scigap/stagingnew/pga_config/ampgateway/vars.yml b/dev-tools/ansible/inventories/scigap/stagingnew/pga_config/ampgateway/vars.yml
deleted file mode 100644
index a3e098a..0000000
--- a/dev-tools/ansible/inventories/scigap/stagingnew/pga_config/ampgateway/vars.yml
+++ /dev/null
@@ -1,65 +0,0 @@
-#
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
----
-pga_repo: "https://github.com/apache/airavata-php-gateway.git"
-user: "pga"
-group: "pga"
-doc_root_dir: "/var/www/portals/{{ gateway_id }}"
-vhost_servername: "ampgateway.org"
-vhost_serveralias: "www.ampgateway.org"
-vhost_ssl: true
-# TODO: have Ansible manage these files as well
-ssl_certificate_file: "/etc/letsencrypt/live/ampgateway.org/cert.pem"
-ssl_certificate_chain_file: "/etc/letsencrypt/live/ampgateway.org/fullchain.pem"
-ssl_certificate_key_file: "/etc/letsencrypt/live/ampgateway.org/privkey.pem"
-
-## Keycloak related variables
-tenant_domain: "{{ gateway_id }}"
-admin_username: "admin"
-admin_password: "{{ vault_admin_password }}"
-oauth_client_key: "{{ vault_oauth_client_key }}"
-oauth_client_secret: "{{ vault_oauth_client_secret }}"
-oidc_discovery_url: "https://iam.scigap.org/auth/realms/{{ tenant_domain }}/.well-known/openid-configuration"
-
-auth_options:
-  - name: "Atomic and Molecular Physics and Optics Gateway"
-    oauth_grant_type: "password"
-  - name: "Existing Institute Login" #CILogon
-    oauth_grant_type: "authorization_code"
-    oauth_authorize_url_extra_params: "kc_idp_hint=cilogon"
-    logo: "/assets/cilogon-logo-24x24-b.png"
-oauth_callback_url: "https://{{ vhost_servername }}/callback-url"
-
-gateway_id: "amp"
-# relative to document root dir
-experiment_data_dir: "{{ user_data_dir }}/{{ gateway_id }}"
-gateway_data_store_resource_id: "gf4.ucs.indiana.edu_61552681-96f0-462a-a36c-a62a010bffc6"
-gateway_data_store_ssh_public_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCAfFAdLrGC/om63ipx9RhuzcGnMlVQkKsuy5NtUgK7I4OdTJ1Ck1H/ARBwiWNQy08GO2HETfM7StCROwW+tlZ6n+THBkbei4G8q6xV6UXlC3BJxuDlwkxnyOFSYEt8Qd2g8IC/X0qo9/m5Ea9Z5axzTk+n2OZlV87DrLheV+OVhgf+yYGVo9egTZ7Kg/TV/Hl1xeU5JgRcPPrLrWYn8vEQo7xT5boS3X9y2o7FgNTdUf5K10ZJ37RWcLQpzZ+7zEKs/P/I/QU+BUhxRRfnEf/4e4L3OFE36SQ4DSFmu3lKU4BcQQb3A6SfQGC1PwQdD5y9MUkpit4hMCSJLjVBTN3H"
-
-## Portal related variables
-super_admin_portal: "false"
-admin_emails: "['sgrc-iu-group@iu.edu']"
-portal_email_username: "pga.airavata@gmail.com"
-portal_email_password: "{{ vault_portal_email_password }}"
-#portal_theme: "gsu-gateway-theme"
-#portal_theme_repo: "https://github.com/SciGaP/gsu-gateway-theme"
-portal_title: "Atomic and Molecular Physics and Optics Gateway"
-...
diff --git a/dev-tools/ansible/inventories/scigap/stagingnew/pga_config/ampgateway/vault.yml b/dev-tools/ansible/inventories/scigap/stagingnew/pga_config/ampgateway/vault.yml
deleted file mode 100644
index 5402ab4..0000000
--- a/dev-tools/ansible/inventories/scigap/stagingnew/pga_config/ampgateway/vault.yml
+++ /dev/null
@@ -1,18 +0,0 @@
-$ANSIBLE_VAULT;1.1;AES256
-30313366393261363736616665633361663834386531363130303065373731326162373230333434
-3139663962623065653238363063313962616162376530660a663963366638643733353436386364
-64646330326336666130346337333564383730613039333233333537663230653930353031653539
-3039306638363465620a303765326131346163356639303439336661613130373566356431326565
-62353339633861383965323464643062613463313461626661366533656664653762326435306562
-62356266386366613162346466353532646361613863393339333934373662333437303635643738
-32383639346362303930383763613364386137303632303264636238666564653838373035313332
-30323265616165666637333831663631633763343161383538353237633736386238373039356331
-61316266623165373638633835616163303435303764313138653437626533313364646433663631
-36616530633761356466376134336533636334343566636539663834623932373436313965633463
-33353332613232363061303237623637373230616336633531643633323339353230333532316565
-61653234613164373036366232623937383266616463313966643232656137366161613535343732
-34306238336562303939323636373233636130316534313238376434663635323030383337306533
-37646466653235636631363734323638306163326262396531343334353937626466666432616234
-34333937643264356164633761303035313336393233636633356565646563633333666639646632
-38353864656464633639313863666338616264333133366331306636303863623731663632646362
-3838
diff --git a/dev-tools/ansible/inventories/scigap/stagingnew/pga_config/csbglsu/vars.yml b/dev-tools/ansible/inventories/scigap/stagingnew/pga_config/csbglsu/vars.yml
deleted file mode 100644
index 8d7e82a..0000000
--- a/dev-tools/ansible/inventories/scigap/stagingnew/pga_config/csbglsu/vars.yml
+++ /dev/null
@@ -1,62 +0,0 @@
-#
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
----
-pga_repo: "https://github.com/apache/airavata-php-gateway.git"
-user: "pga"
-group: "pga"
-doc_root_dir: "/var/www/portals/{{ gateway_id }}"
-vhost_servername: "sciencegateway.brylinski.org"
-vhost_server_redirect: "www.sciencegateway.brylinski.org"
-vhost_ssl: true
-# TODO: have Ansible manage these files as well
-ssl_certificate_file: "/etc/letsencrypt/live/sciencegateway.brylinski.org/cert.pem"
-ssl_certificate_chain_file: "/etc/letsencrypt/live/sciencegateway.brylinski.org/fullchain.pem"
-ssl_certificate_key_file: "/etc/letsencrypt/live/sciencegateway.brylinski.org/privkey.pem"
-
-## Keycloak related variables
-tenant_domain: "{{ gateway_id }}"
-admin_username: "admin"
-admin_password: "{{ vault_admin_password }}"
-oauth_client_key: "{{ vault_oauth_client_key }}"
-oauth_client_secret: "{{ vault_oauth_client_secret }}"
-oidc_discovery_url: "https://iam.scigap.org/auth/realms/{{ tenant_domain }}/.well-known/openid-configuration"
-
-auth_options:
-  - name: "LSU Computational Sys Biology"
-    oauth_grant_type: "password"
-oauth_callback_url: "https://{{ vhost_servername }}/callback-url"
-
-gateway_id: "lsu-computational-sys-biology"
-# relative to document root dir
-experiment_data_dir: "{{ user_data_dir }}/{{ gateway_id }}"
-gateway_data_store_resource_id: "gf4.ucs.indiana.edu_61552681-96f0-462a-a36c-a62a010bffc6"
-gateway_data_store_ssh_public_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDc/WQnD40zGuO+bIMsWc0ey8oxDzEj/dPFPg8LN7oNn/V7pi74mF2D57wgA8KsxcpsNydcReSXZhx6FynlK6iABDZP5QdREmhm87gkrMQUA/ZI7R2q7ekchbRtCnrGwU/pdHBh4penaiScs08o7OPfqJJp/TfgwH92dA9dThqGf9hD1Y0nmWECfvX56rXAggcgZl+Q6IFD0VFinFMkqZRWFFi4Zm7yiKCNWYXvXlIGjFOlDp0/ONGg5wjpCFivhI934Uk6Y69hSMhnFJc6g1JHD4PLaBILlUjwEikmH6KL3ii6Wt30pou+tIihBDBv0ODR4jDiOeBJGkcisWeh3Uzj"
-
-## Portal related variables
-super_admin_portal: "false"
-admin_emails: "['sgrc-iu-group@iu.edu','mbrylinski@lsu.edu']"
-portal_email_username: "pga.airavata@gmail.com"
-portal_email_password: "{{ vault_portal_email_password }}"
-portal_theme: "csbglsu-gateway-theme"
-portal_theme_repo: "https://github.com/SciGaP/csbglsu-gateway-theme"
-portal_title: "LSU Computational Sys Biology"
-pga_google_analytics_id: "UA-117484529-1"
-...
diff --git a/dev-tools/ansible/inventories/scigap/stagingnew/pga_config/csbglsu/vault.yml b/dev-tools/ansible/inventories/scigap/stagingnew/pga_config/csbglsu/vault.yml
deleted file mode 100644
index 389345b..0000000
--- a/dev-tools/ansible/inventories/scigap/stagingnew/pga_config/csbglsu/vault.yml
+++ /dev/null
@@ -1,18 +0,0 @@
-$ANSIBLE_VAULT;1.1;AES256
-37373436626563633733323039346662383239383061336466343737393938656462636137346131
-3031373436643263613533396333343737643739313031310a356263326561396432613635653138
-66306332326430373161353835386561356238616135663933363864663039343131636430316265
-3731613866633663360a383131363564373532303438313837633766656131346132653964333735
-66386332336132313833613335613763633133386430346535383662643730376233643931323038
-35633238623962343165333935323936303366393465623733616431303638313562336236346635
-35353239303363373537386430616261643664306139616336626462666139616562333364656431
-33353839353637333266343538653133383232366563363965323662626437396264383734656137
-30356534386264326636313465643534396639323232613637613031613736323433373238336437
-61373732316536363861643131366364653764363964356334366430336130336233383837653131
-62313039643330666665323931613039613930643665383535306432333361316630613836653761
-37396135313138396661626131646261346139353566353666623037393063656361303237613437
-64636163373962666562383164653334323335623065373063396564376465633238316332346336
-66356130383131373065633839333335663864326234373963383536383864316330383561376430
-33323232373766653139393238313533343638333334383832346562666132666265653135633030
-38373634366433623731393561646330383466353062646338373837383336323361623362663264
-3661
diff --git a/dev-tools/ansible/inventories/scigap/stagingnew/pga_config/ddstudio/vars.yml b/dev-tools/ansible/inventories/scigap/stagingnew/pga_config/ddstudio/vars.yml
deleted file mode 100644
index 4b327e8..0000000
--- a/dev-tools/ansible/inventories/scigap/stagingnew/pga_config/ddstudio/vars.yml
+++ /dev/null
@@ -1,65 +0,0 @@
-#
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
----
-pga_repo: "https://github.com/apache/airavata-php-gateway.git"
-user: "pga"
-group: "pga"
-doc_root_dir: "/var/www/portals/{{ gateway_id }}"
-vhost_servername: "ddstudio.scigap.org"
-#vhost_serveralias: "sciencegateway.searchsra.org"
-vhost_ssl: true
-# TODO: have Ansible manage these files as well
-ssl_certificate_file: "/etc/letsencrypt/live/ddstudio.scigap.org/cert.pem"
-ssl_certificate_chain_file: "/etc/letsencrypt/live/ddstudio.scigap.org/fullchain.pem"
-ssl_certificate_key_file: "/etc/letsencrypt/live/ddstudio.scigap.org/privkey.pem"
-
-## Keycloak related variables
-tenant_domain: "{{ gateway_id }}"
-admin_username: "admin"
-admin_password: "{{ vault_admin_password }}"
-oauth_client_key: "{{ vault_oauth_client_key }}"
-oauth_client_secret: "{{ vault_oauth_client_secret }}"
-oidc_discovery_url: "https://iam.scigap.org/auth/realms/{{ tenant_domain }}/.well-known/openid-configuration"
-
-auth_options:
-  - name: "DDStudio Gateway"
-    oauth_grant_type: "password"
-  - name: "Existing Institute Login"
-    oauth_grant_type: "authorization_code"
-    oauth_authorize_url_extra_params: "kc_idp_hint=cilogon"
-    logo: "/assets/cilogon-logo-24x24-b.png"
-oauth_callback_url: "http://{{ vhost_servername }}/callback-url"
-
-gateway_id: "ddstudio"
-# relative to document root dir
-experiment_data_dir: "{{ user_data_dir }}/{{ gateway_id }}"
-gateway_data_store_resource_id: "gf4.ucs.indiana.edu_61552681-96f0-462a-a36c-a62a010bffc6"
-gateway_data_store_ssh_public_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCDmZ5IkEh5n8g994e825SmnrzkjzTT6t07iEsWAXPOuK9RSg365MfDw2qXQnWkUSQO2ksqJoqxyEeeUMbEMdoHSq/NzXoXuhg3RyjA/WgBnt+zEc+H0rwzrD5aDPliOoHT4CnezX9IuKOIedxZsybFinI+9eOONJczKYoIXgHIOxv8ARqB7i/juoi3xFMHGw50VXM8vA7hOajojNwH9PvdnRNzZEvXg0hyAMgnxVGhbudqkATkEoD0OVYhY9Y+yFaMogIhfmbpeMhBnOvEBtkZxHI3oX12opskin78jPmYOUvOH0Qb690qy7TkBahEp/sN8U7yXY950s/Kg3AI7FZF"
-
-## Portal related variables
-super_admin_portal: "false"
-admin_emails: "['sgrc-iu-group@iu.edu']"
-portal_email_username: "pga.airavata@gmail.com"
-portal_email_password: "{{ vault_portal_email_password }}"
-#portal_theme: "searchingsra-gateway-theme"
-#portal_theme_repo: "https://github.com/SciGaP/gsu-gateway-theme"
-portal_title: "DDStudio Gateway"
-...
diff --git a/dev-tools/ansible/inventories/scigap/stagingnew/pga_config/ddstudio/vault.yml b/dev-tools/ansible/inventories/scigap/stagingnew/pga_config/ddstudio/vault.yml
deleted file mode 100644
index 74ad68f..0000000
--- a/dev-tools/ansible/inventories/scigap/stagingnew/pga_config/ddstudio/vault.yml
+++ /dev/null
@@ -1,17 +0,0 @@
-$ANSIBLE_VAULT;1.1;AES256
-34366665383634643362666531363235353532653165666637383664306134623264393136623762
-3461646336656537663034643238393465336263396364610a636234386266323232343363336565
-38653664653230363362353237353164306663356361383631303865323833623633656664306362
-3866363339306461640a343663383135636438303436383964613530663061353563636432346336
-63383536653734306161313539643936373364383535626230363138373437376366393764616366
-62346232356234616437666431353966326633353734363236353138333565383563663332333532
-31376438383231653766353966616432383834323336616336643764393734663633663463623762
-63323437303661306565366664356430633838356234663663306331323166636139303532623962
-64383334626133666364653630336138363039623865383535306433336634313663356562333830
-63393739636332303734343062393537626634343262623334633366643330623838633430356537
-61646433633735363964316564326432363161366531393166643261343931653532353937366231
-35663364396338393961393039613262316630663739656635393361663831363665646430616335
-62633632333633386534643135633231636361353761373563613063396165633231343662633362
-65646138346464313637656234616536653033333337653635633931333764626130366335306266
-32353639303864323030356134616463373466626239383765643137663538636230666339663463
-65313233643264626461
diff --git a/dev-tools/ansible/inventories/scigap/stagingnew/pga_config/distantreader/vars.yml b/dev-tools/ansible/inventories/scigap/stagingnew/pga_config/distantreader/vars.yml
deleted file mode 100644
index 084b0bc..0000000
--- a/dev-tools/ansible/inventories/scigap/stagingnew/pga_config/distantreader/vars.yml
+++ /dev/null
@@ -1,66 +0,0 @@
-#
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
----
-pga_repo: "https://github.com/apache/airavata-php-gateway.git"
-user: "pga"
-group: "pga"
-doc_root_dir: "/var/www/portals/{{ gateway_id }}"
-vhost_servername: "distantreader.org"
-#vhost_serveralias: "distantreader.scigap.org"
-vhost_ssl: true
-# TODO: have Ansible manage these files as well
-ssl_certificate_file: "/etc/letsencrypt/live/distantreader.org/cert.pem"
-ssl_certificate_chain_file: "/etc/letsencrypt/live/distantreader.org/fullchain.pem"
-ssl_certificate_key_file: "/etc/letsencrypt/live/distantreader.org/privkey.pem"
-
-## Keycloak related variables
-tenant_domain: "{{ gateway_id }}"
-admin_username: "admin"
-admin_password: "{{ vault_admin_password }}"
-oauth_client_key: "{{ vault_oauth_client_key }}"
-oauth_client_secret: "{{ vault_oauth_client_secret }}"
-oidc_discovery_url: "https://iam.scigap.org/auth/realms/{{ tenant_domain }}/.well-known/openid-configuration"
-
-auth_options:
-  - name: "Distant Reader Gateway"
-    oauth_grant_type: "password"
-  - name: "Existing Institute Login"
-    oauth_grant_type: "authorization_code"
-    oauth_authorize_url_extra_params: "kc_idp_hint=cilogon"
-    logo: "/assets/cilogon-logo-24x24-b.png"
-
-oauth_callback_url: "https://{{ vhost_servername }}/callback-url"
-
-gateway_id: "distantreader"
-# relative to document root dir
-experiment_data_dir: "{{ user_data_dir }}/{{ gateway_id }}"
-gateway_data_store_resource_id: "gf4.ucs.indiana.edu_61552681-96f0-462a-a36c-a62a010bffc6"
-gateway_data_store_ssh_public_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCCgAWzF/GHT0ZesTM9JtUtvYBmaunOc5V4ab5//jUjC7vjF7s1fon4MvALvWCoC1uPvppG3NRzq4huAQCX89wu/9zJErpuKDpkjjTf90cHl+YxzHGGFUUtllSTZzhSyhUaMXC1qzeJg7TLdzOct+21HyoqSIJe86Aj8DQuAMXky6l7XFz5YqMkzY9kG/sS0rFRfpjz4K3zWe/Y7a0lQnKzePM/d6zrcdkiYhlMrCbEFcrWWMYNpIkWq7psjQiQ9SlICrNso6NQQSNy4CeoItDGSe7GsXdQLqdRMXUKua22G7wrq2ibh4Kqcid+mVJ8kyYQJO2UCdC2cOYd0EljmHh/"
-
-## Portal related variables
-super_admin_portal: "false"
-admin_emails: "['sgrc-iu-group@iu.edu','emorgan@nd.edu']"
-portal_email_username: "pga.airavata@gmail.com"
-portal_email_password: "{{ vault_portal_email_password }}"
-portal_theme: "distantreader-gateway-theme"
-portal_theme_repo: "https://github.com/SciGaP/distantreader-gateway-theme"
-portal_title: "Distant Reader Gateway"
-...
diff --git a/dev-tools/ansible/inventories/scigap/stagingnew/pga_config/distantreader/vault.yml b/dev-tools/ansible/inventories/scigap/stagingnew/pga_config/distantreader/vault.yml
deleted file mode 100644
index 55c43e7..0000000
--- a/dev-tools/ansible/inventories/scigap/stagingnew/pga_config/distantreader/vault.yml
+++ /dev/null
@@ -1,18 +0,0 @@
-$ANSIBLE_VAULT;1.1;AES256
-34393466636365313934626439613237323039383831323731623239646266656432333663356239
-3632393362636239623366643232653265363233343962380a646537313134313333306266623439
-30346334633734646162636339613566653234613364663830666333353562663930323735326530
-6331663733343661630a623466383235666130643634326230353563616534343037393036376236
-66383663666234663034613538626561623864623266656164646165353339636434656563376536
-34633465386333306366316665646166396635383861353836616233313132356336663731376265
-31356165663435653839633063313931333564366662633561353863623837636137613365633634
-33303435626566366661326433313464316436353537623062313830643830396634303430656163
-32376231363365643764636333353539313333303232653633383364373335333630363666346637
-31333130343439303836333337636464303034613332646439373633356631626630333739316136
-33333538646462336435366333633439316234616332323136333136643361323462393639373935
-38366139626437353237353964633836313938333239346637626637376532396163346235633762
-65323965633962306132396337643766363133636638656430386538396335303931366565353536
-31623161626234303837376464663332326139613865663037633061633436383261333631303734
-39323266353733356563396634653365616231333134386134353330353361336362643536326632
-30646236663763343833663137663935326538663536316662356533663035633030656665376337
-3339
diff --git a/dev-tools/ansible/inventories/scigap/stagingnew/pga_config/epwgateway/vars.yml b/dev-tools/ansible/inventories/scigap/stagingnew/pga_config/epwgateway/vars.yml
deleted file mode 100644
index fd1cac7..0000000
--- a/dev-tools/ansible/inventories/scigap/stagingnew/pga_config/epwgateway/vars.yml
+++ /dev/null
@@ -1,64 +0,0 @@
-#
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
----
-pga_repo: "https://github.com/apache/airavata-php-gateway.git"
-user: "pga"
-group: "pga"
-doc_root_dir: "/var/www/portals/{{ gateway_id }}"
-vhost_servername: "epw-gateway.cs.binghamton.edu"
-vhost_ssl: true
-# TODO: have Ansible manage these files as well
-ssl_certificate_file: "/etc/letsencrypt/live/epw-gateway.cs.binghamton.edu/cert.pem"
-ssl_certificate_chain_file: "/etc/letsencrypt/live/epw-gateway.cs.binghamton.edu/fullchain.pem"
-ssl_certificate_key_file: "/etc/letsencrypt/live/epw-gateway.cs.binghamton.edu/privkey.pem"
-
-## Keycloak related variables
-tenant_domain: "{{ gateway_id }}"
-admin_username: "admin"
-admin_password: "{{ vault_admin_password }}"
-oauth_client_key: "{{ vault_oauth_client_key }}"
-oauth_client_secret: "{{ vault_oauth_client_secret }}"
-oidc_discovery_url: "https://iam.scigap.org/auth/realms/{{ tenant_domain }}/.well-known/openid-configuration"
-
-auth_options:
-  - name: "Electron-Phonon-Wannier (EPW) Gateway"
-    oauth_grant_type: "password"
-# - name: "CILogon"
-#    oauth_grant_type: "authorization_code"
-#   oauth_authorize_url_extra_params: "kc_idp_hint=cilogon"
-#   logo: "/assets/cilogon-logo-24x24-b.png"
-oauth_callback_url: "http://{{ vhost_servername }}/callback-url"
-
-gateway_id: "epw-gateway"
-# relative to document root dir
-experiment_data_dir: "{{ user_data_dir }}/{{ gateway_id }}"
-gateway_data_store_resource_id: "gf4.ucs.indiana.edu_61552681-96f0-462a-a36c-a62a010bffc6"
-gateway_data_store_ssh_public_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCSqYzuDDUNK3uX4AG7sg9diKERh716i0lA5RfbvfUhm+hVmyJ1P+0/OLZqwrwqzd9+1v/U08GAhys/qeOD2+x0ujgyKtY+5cjk3Td01sVTEmcXJPYhhWyAOrhhUAVAL51Zh7u2Zd/0RWf3iG0fuPPQQaBCIEY3wApwuqsLVk9G0plMtZgzXPGLgK9Ou8xJ8806yGx92nc1b1grmgkYugv5SQTe2lhmrXI/WUnfuoweadNzU0uSwwL6AaZa9grCAV1YVnGq6IX+Euwpx/P1pSRNWkoNHkm8fpkz/6dqq5YFxgr3QN0JQU5OSbbwWTWQcXr1kWNx+yS4qCtDc42EHsf3"
-
-## Portal related variables
-super_admin_portal: "false"
-admin_emails: "['sgrc-iu-group@iu.edu','psaha4@binghamton.edu','grattih1@binghamton.edu','mgovinda@binghamton.edu']"
-portal_email_username: "pga.airavata@gmail.com"
-portal_email_password: "{{ vault_portal_email_password }}"
-#portal_theme: "searchingsra-gateway-theme"
-#portal_theme_repo: "https://github.com/SciGaP/gsu-gateway-theme"
-portal_title: "Electron-Phonon-Wannier (EPW) Gateway"
-...
diff --git a/dev-tools/ansible/inventories/scigap/stagingnew/pga_config/epwgateway/vault.yml b/dev-tools/ansible/inventories/scigap/stagingnew/pga_config/epwgateway/vault.yml
deleted file mode 100644
index ac639bd..0000000
--- a/dev-tools/ansible/inventories/scigap/stagingnew/pga_config/epwgateway/vault.yml
+++ /dev/null
@@ -1,18 +0,0 @@
-$ANSIBLE_VAULT;1.1;AES256
-64383735636136386439633130363232343062666231303362343932636562393266326538633937
-6232646261353362396166663232643236383237613430310a636363303835613561653265633261
-37383361376462653565346466303864366365383033396338303463666530646535666235643934
-6333626231646137390a633235356134326463373035353834616231613339356132383339643632
-32383939316663366262306562313035636262666366336235643935616566633633343462373435
-31366235373265346633356634363038343937396334336633616230356635346665343938363339
-62326132663730333030373431356563383061373432666539353032356134303763633035663866
-38646565336635303133646363613531643834323664656634323563373031666232326564353131
-34643565663733616338373939366263323139623531376162316434323936386562386336666438
-39333736333432333662393538313431613135353162393831336663366139616638336236336161
-32633566386431653239343030336331636636646466356234343439346463623037666235616234
-37333361633931363063386665316165386161383939633232376232373164316361663862373133
-32666363323730313139396330343930323430353365663261656134646333613966393731356463
-31343336626130393766303039323964623932646234386163633236666636383161343738613435
-35323138343634383638366130636364646463376564663231343133333530643737356133393135
-37636139386339373334333863663835666234316436373334336365376663386430633831383032
-3133
diff --git a/dev-tools/ansible/inventories/scigap/stagingnew/pga_config/gatech/vars.yml b/dev-tools/ansible/inventories/scigap/stagingnew/pga_config/gatech/vars.yml
deleted file mode 100644
index b15fa15..0000000
--- a/dev-tools/ansible/inventories/scigap/stagingnew/pga_config/gatech/vars.yml
+++ /dev/null
@@ -1,60 +0,0 @@
-#
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
----
-pga_repo: "https://github.com/apache/airavata-php-gateway.git"
-user: "pga"
-group: "pga"
-doc_root_dir: "/var/www/portals/georgia-tech"
-vhost_servername: "gatech.scigap.org"
-vhost_ssl: true
-# TODO: have Ansible manage these files as well
-ssl_certificate_file: "/etc/letsencrypt/live/gatech.scigap.org/cert.pem"
-ssl_certificate_chain_file: "/etc/letsencrypt/live/gatech.scigap.org/fullchain.pem"
-ssl_certificate_key_file: "/etc/letsencrypt/live/gatech.scigap.org/privkey.pem"
-
-## Keycloak related variables
-tenant_domain: "{{ gateway_id }}"
-admin_username: "admin"
-admin_password: "{{ vault_admin_password }}"
-oauth_client_key: "{{ vault_oauth_client_key }}"
-oauth_client_secret: "{{ vault_oauth_client_secret }}"
-oidc_discovery_url: "https://iam.scigap.org/auth/realms/{{ tenant_domain }}/.well-known/openid-configuration"
-
-auth_options:
-  - name: "Georgia Tech Science Gateway"
-    oauth_grant_type: "password"
-oauth_callback_url: "https://{{ vhost_servername }}/callback-url"
-
-gateway_id: "georgia-tech"
-# relative to document root dir
-experiment_data_dir: "{{ user_data_dir }}/georgia-tech"
-gateway_data_store_resource_id: "gf4.ucs.indiana.edu_61552681-96f0-462a-a36c-a62a010bffc6"
-gateway_data_store_ssh_public_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQClwPzT95sK4eA5vuOHe+9cDewjkfBZA0GLt7SfHtJ5Zp/DBWRb5ykobX7JbwJGN9eHmVnW1yL5O708/dLL3y8kT0MjEP5jxZKMSayAiP9c2yN8dved4DIomX3omqsztIcbllei+QM9YvFY7tTtjWFTtAX6WxkZEvzcv2MDTLbgqJ537B4WRRWchXFws98QfDZvlfvdql6BcoZMwDCjdNOl8ZqSTS0PC22+HFesdhMh4mjjNj3Sm2MqxjU8FmSjVlC37dubqS9lZMeKuwsgT1nMjCB8tL+FH5eneNLVKvsvJL4AgQNo84YFi/Gels40zVuCqXVRNsAw/Tn+9sH9JgVx"
-
-## Portal related variables
-super_admin_portal: "false"
-admin_emails: "['sgg@iu.edu', 'fang.liu@gatech.edu']"
-portal_email_username: "pga.airavata@gmail.com"
-portal_email_password: "{{ vault_portal_email_password }}"
-#portal_theme: "gsu-gateway-theme"
-#portal_theme_repo: "https://github.com/SciGaP/gsu-gateway-theme"
-portal_title: "Georgia Tech Science Gateway"
-...
diff --git a/dev-tools/ansible/inventories/scigap/stagingnew/pga_config/gatech/vault.yml b/dev-tools/ansible/inventories/scigap/stagingnew/pga_config/gatech/vault.yml
deleted file mode 100644
index a35b80f..0000000
--- a/dev-tools/ansible/inventories/scigap/stagingnew/pga_config/gatech/vault.yml
+++ /dev/null
@@ -1,18 +0,0 @@
-$ANSIBLE_VAULT;1.1;AES256
-34323339333637343366613565366164626566366334646334396464353935326438373335383138
-3735616634653230613065616235316533373266376636610a326639346137373932663932643036
-35333631303936663231303166653335313433623136346632356362343234336437343466366365
-3231613235323933310a356337303036346430323932626635353164336264366361333161363466
-61373633303131656462333766356334333839613939333439613930353235643566383437366338
-64366239616331366263323234393361303366393537396434333337393763383534333538633331
-61643262656636353434363134333435626166396138396261373033323131323962363963323933
-30613337646438616439356230333034326666396438353663326566336432373738346334376162
-38313466363036613131346330393234636139363136313539333237346562366136616336396236
-62363164383336363265303438316234333439336439323034616130336236316531613062323038
-38616163616236616333383063356132616533366439313530646636626664633638363765393962
-66376639343066353931633234333835326361646262393763343933386166383936653438313161
-39613630373065616439333863366262396633316263303963393265333936303333366236613161
-35326532646434353339333439303966613039333331323433653566303566333866376531646531
-38633339333033613965653434613537656432373834663464643666343934663365666662623363
-37343835356163613033303735333263616163303861363736663261373636386239303032383663
-3664
diff --git a/dev-tools/ansible/inventories/scigap/stagingnew/pga_config/georgiastate/vars.yml b/dev-tools/ansible/inventories/scigap/stagingnew/pga_config/georgiastate/vars.yml
deleted file mode 100644
index 018cc1c..0000000
--- a/dev-tools/ansible/inventories/scigap/stagingnew/pga_config/georgiastate/vars.yml
+++ /dev/null
@@ -1,64 +0,0 @@
-#
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
----
-pga_repo: "https://github.com/apache/airavata-php-gateway.git"
-user: "pga"
-group: "pga"
-doc_root_dir: "/var/www/portals/georgia-state"
-vhost_servername: "hpcgateway.gsu.edu"
-vhost_ssl: True
-# TODO: have Ansible manage these files as well
-ssl_certificate_file: "/etc/letsencrypt/live/hpcgateway.gsu.edu/cert.pem"
-ssl_certificate_chain_file: "/etc/letsencrypt/live/hpcgateway.gsu.edu/fullchain.pem"
-ssl_certificate_key_file: "/etc/letsencrypt/live/hpcgateway.gsu.edu/privkey.pem"
-
-## Keycloak related variables
-tenant_domain: "{{ gateway_id }}"
-admin_username: "adminuser"
-admin_password: "{{ vault_admin_password }}"
-oauth_client_key: "{{ vault_oauth_client_key }}"
-oauth_client_secret: "{{ vault_oauth_client_secret }}"
-oidc_discovery_url: "https://iam.scigap.org/auth/realms/{{ tenant_domain }}/.well-known/openid-configuration"
-
-auth_options:
-  - name: "Georgia State Science Gateway"
-    oauth_grant_type: "password"
-  - name: "GSU Login"
-    oauth_grant_type: "authorization_code"
-    oauth_authorize_url_extra_params: "kc_idp_hint=cilogon"
-    logo: "/assets/gsu.png" #cilogon-logo-24x24-b.png
-oauth_callback_url: "https://{{ vhost_servername }}/callback-url"
-
-gateway_id: "georgiastate"
-# relative to document root dir
-experiment_data_dir: "{{ user_data_dir }}/georgia-state"
-gateway_data_store_resource_id: "gf4.ucs.indiana.edu_61552681-96f0-462a-a36c-a62a010bffc6"
-gateway_data_store_ssh_public_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCFSg9IEgsXlGhgPkj4hPuON30rbE3/gUUn4K3NVvBFKLyQQ8Pm/NR6dZmFglQR1HxBRSnq4WmH3EVyxHuT7MkQDAjTkclEuhaRjcYN0nua8g4dI9SgO9DeqbOyurVIuw/YChP5nC+6/ubMyzYPr6Z5xU5QHZI/QlVG4nz3joMIKkRXt/bsaEvv+/nzED/j6FTdK6P6dg1ESkNVZUPqhtWpwuC28Et7/86jcEObJedwx8geLoxKogPZ6kqO+Q/WUHDtMpFYtwuPaiYuN3Pb/GCvnDRsSoFmtRU+UH1UIdEy0piYUuBW+5aCv/PbH/UtHFg1Y1942TYCXv4rl1i/KW1z"
-
-## Portal related variables
-super_admin_portal: "false"
-admin_emails: "['sgrc-iu-group@iu.edu','neranjan@gsu.edu']"
-portal_email_username: "pga.airavata@gmail.com"
-portal_email_password: "{{ vault_portal_email_password }}"
-portal_theme: "gsu-gateway-theme"
-portal_theme_repo: "https://github.com/SciGaP/gsu-gateway-theme"
-portal_title: "Georgia State Science Gateway"
-...
diff --git a/dev-tools/ansible/inventories/scigap/stagingnew/pga_config/georgiastate/vault.yml b/dev-tools/ansible/inventories/scigap/stagingnew/pga_config/georgiastate/vault.yml
deleted file mode 100644
index c5fa548..0000000
--- a/dev-tools/ansible/inventories/scigap/stagingnew/pga_config/georgiastate/vault.yml
+++ /dev/null
@@ -1,18 +0,0 @@
-$ANSIBLE_VAULT;1.1;AES256
-30666232353938613062313661636131393165313030623965653733363963303339643832363738
-3936333664373530633938326230363861306339303436320a373462646666313562333332623932
-63363366613531613232376537636365653238653465323564363739663862383936323139373230
-3836346330396633640a313034356231353030663366633131653836336664313330316237343861
-62346266376334616639396234323430633732393739366139643231313933613939616231636237
-61633334326161316333343533643939333830373838313531646634656332666530396138626539
-63353664633066383832646233323131316466636237356132663833313831616133613563313831
-38616538653636393036366635373833356436623337373631376562353339336131643633346630
-66653635613263636539633131376138373231316131346662366264366231386566613364353136
-31383634326265343734333634343264386665316338336365386630633734386138356534386566
-33623138393439353233333636313266663338323564333739346239653534616164346530626663
-35626233393437353064333866653162373064616261653461323936303738386432316530666233
-62326130623134666136383431316565343733336564373033613038326531396531373839393234
-61666362613736656238356161363833656164333734383737656664626631623837353936396239
-32393261633931346538363535646461356263643834643839316461613238666337643730356537
-65323566373235373264373463356130303937666664326463363365376637646366613831656137
-3566
diff --git a/dev-tools/ansible/inventories/scigap/stagingnew/pga_config/hubzero/vars.yml b/dev-tools/ansible/inventories/scigap/stagingnew/pga_config/hubzero/vars.yml
deleted file mode 100644
index cffe8e3..0000000
--- a/dev-tools/ansible/inventories/scigap/stagingnew/pga_config/hubzero/vars.yml
+++ /dev/null
@@ -1,64 +0,0 @@
-#
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
----
-pga_repo: "https://github.com/apache/airavata-php-gateway.git"
-user: "pga"
-group: "pga"
-doc_root_dir: "/var/www/portals/{{ gateway_id }}"
-vhost_servername: "hubzero.scigap.org"
-vhost_ssl: true
-# TODO: have Ansible manage these files as well
-ssl_certificate_file: "/etc/letsencrypt/live/hubzero.scigap.org/cert.pem"
-ssl_certificate_chain_file: "/etc/letsencrypt/live/hubzero.scigap.org/fullchain.pem"
-ssl_certificate_key_file: "/etc/letsencrypt/live/hubzero.scigap.org/privkey.pem"
-
-## Keycloak related variables
-tenant_domain: "{{ gateway_id }}"
-admin_username: "admin"
-admin_password: "{{ vault_admin_password }}"
-oauth_client_key: "{{ vault_oauth_client_key }}"
-oauth_client_secret: "{{ vault_oauth_client_secret }}"
-oidc_discovery_url: "https://iam.scigap.org/auth/realms/{{ tenant_domain }}/.well-known/openid-configuration"
-
-auth_options:
-  - name: "HubZero Gateway"
-    oauth_grant_type: "password"
-  - name: "Existing Institute Login" #CILogon
-    oauth_grant_type: "authorization_code"
-    oauth_authorize_url_extra_params: "kc_idp_hint=cilogon"
-    logo: "/assets/cilogon-logo-24x24-b.png"
-oauth_callback_url: "https://{{ vhost_servername }}/callback-url"
-
-gateway_id: "hubzero"
-# relative to document root dir
-experiment_data_dir: "{{ user_data_dir }}/{{ gateway_id }}"
-gateway_data_store_resource_id: "gf4.ucs.indiana.edu_61552681-96f0-462a-a36c-a62a010bffc6"
-gateway_data_store_ssh_public_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDEs5h0NUb+8yDYtAXigQDQ/s2tQmIKTMJYhxiDRnxGSGylIMPVkKfbhytNry+fOd4aJ4q7HxkR4K808NqmytfH9o06De5ODkbp2InpzWw4O4QtKNwaqwNpIukU+S1seaodQaNfKeniT+LAq5pGQgUYdcIH4PjFSKY1z0HmfktY55lwGxdUwfe81aDMQ9Zu/310656/BftgdFIA51sOiL4nCxFj7H5cLeeSZujW5E9Yx7d3u6BCk5YMLrVBqoHThwtKK02BgugypeNn3rJHQvOGduKu0UpHV6IfLayeKGy3YYPzLkVb+ApJo4hOm6zsskWKH3PP3auCEFfyqYonA4sF"
-
-## Portal related variables
-super_admin_portal: "false"
-admin_emails: "['sgrc-iu-group@iu.edu']"
-portal_email_username: "pga.airavata@gmail.com"
-portal_email_password: "{{ vault_portal_email_password }}"
-#portal_theme: "base-gateway-theme"
-#portal_theme_repo: "https://github.com/SciGaP/base-pga-theme"
-portal_title: "HubZero Gateway"
-...
diff --git a/dev-tools/ansible/inventories/scigap/stagingnew/pga_config/hubzero/vault.yml b/dev-tools/ansible/inventories/scigap/stagingnew/pga_config/hubzero/vault.yml
deleted file mode 100644
index d9d352d..0000000
--- a/dev-tools/ansible/inventories/scigap/stagingnew/pga_config/hubzero/vault.yml
+++ /dev/null
@@ -1,18 +0,0 @@
-$ANSIBLE_VAULT;1.1;AES256
-31386662393265616233346639353664363632346666373865303733346332373961623432393162
-3336633262396632643438613232663932626139306262310a653966663563313839616135303132
-35633166663863343561663930353666353562356338313965633233613436333261386163363962
-6233356432626461630a636238663332353437306336663133366534303361366161313534623634
-31616233333031386530343065313032623663623366303330363766373037636336393434663462
-66613334656638373131636238633763643565646638346138306235383731633835663231616533
-32666430396664366565626532366232313535336438393939646532663836316235613361323435
-62363635363532306533346464313630643432613966383832623130393364633936646235363831
-66333531346165373630313663383935303838623963346466373939376261333337326565353365
-38623664333738333135636330306137393161343436366361623366323462333264323562623532
-32643461663361383566313734373238396166373162666434323335353338323764353637346231
-33336134623133326130353730303032663135326662376336626266646434663166343535393161
-38343562643236373939653366333231326361373362356136326334313032323135623139373936
-36376139333433663962393361613639376361393162643134373636396463666435663339353962
-39336562616437393635373333323162383936303365303733363365393335353138316231316162
-38313836343838663638653561376539393139663064643564393466313431373664346334313362
-3836
diff --git a/dev-tools/ansible/inventories/scigap/stagingnew/pga_config/interactwel/vars.yml b/dev-tools/ansible/inventories/scigap/stagingnew/pga_config/interactwel/vars.yml
deleted file mode 100644
index 5081d27..0000000
--- a/dev-tools/ansible/inventories/scigap/stagingnew/pga_config/interactwel/vars.yml
+++ /dev/null
@@ -1,64 +0,0 @@
-#
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
----
-pga_repo: "https://github.com/apache/airavata-php-gateway.git"
-user: "pga"
-group: "pga"
-doc_root_dir: "/var/www/portals/{{ gateway_id }}"
-vhost_servername: "interactwel.scigap.org"
-vhost_ssl: true
-# TODO: have Ansible manage these files as well
-ssl_certificate_file: "/etc/letsencrypt/live/interactwel.scigap.org/cert.pem"
-ssl_certificate_chain_file: "/etc/letsencrypt/live/interactwel.scigap.org/fullchain.pem"
-ssl_certificate_key_file: "/etc/letsencrypt/live/interactwel.scigap.org/privkey.pem"
-
-## Keycloak related variables
-tenant_domain: "{{ gateway_id }}"
-admin_username: "admin"
-admin_password: "{{ vault_admin_password }}"
-oauth_client_key: "{{ vault_oauth_client_key }}"
-oauth_client_secret: "{{ vault_oauth_client_secret }}"
-oidc_discovery_url: "https://iam.scigap.org/auth/realms/{{ tenant_domain }}/.well-known/openid-configuration"
-
-auth_options:
-  - name: "InterACTWEL Gateway"
-    oauth_grant_type: "password"
-#  - name: "University Account" #CILogon
-#    oauth_grant_type: "authorization_code"
-#    oauth_authorize_url_extra_params: "kc_idp_hint=cilogon"
-#    logo: "/assets/cilogon-logo-24x24-b.png"
-oauth_callback_url: "https://{{ vhost_servername }}/callback-url"
-
-gateway_id: "interactwel"
-# relative to document root dir
-experiment_data_dir: "{{ user_data_dir }}/{{ gateway_id }}"
-gateway_data_store_resource_id: "gf4.ucs.indiana.edu_61552681-96f0-462a-a36c-a62a010bffc6"
-gateway_data_store_ssh_public_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCFkcK2krGe1tZ339p5bGrBi6+Vrgl9q7VRILUP39C5vC753dajWBtRWI3Id47KXcGPsbl/JPYAn5+jHDFlQwP6aXrGt3npL0thPXOMQ8pykrQs6ridaeFwa3QrlwFVeAhf+Y0FqlXNbl8aHTP0oQAaG8p2ID1/K7GLty0cgiVgEY1aPY6/aQT/81zCoxQzpOodJtU247Ls8I6Lgha/jv6P+fKgcogqaAm39UzCDTy7HN1Owh+yfLh6Cy3XT8SPegVw8XFpOLP8AO1S3CB3B5s1DBdHYOeEGserIbaEgtDHoLw/YIXtAZt9QL6IJ3g9uXVDtZhexj7Rp07QCQhhiaep"
-
-## Portal related variables
-super_admin_portal: "false"
-admin_emails: "['sgrc-iu-group@iu.edu','sammy.rivera@oregonstate.edu','meghna@oregonstate.edu']"
-portal_email_username: "pga.airavata@gmail.com"
-portal_email_password: "{{ vault_portal_email_password }}"
-#portal_theme: "gsu-gateway-theme"
-#portal_theme_repo: "https://github.com/SciGaP/gsu-gateway-theme"
-portal_title: "InterACTWEL Science Gateway"
-...
diff --git a/dev-tools/ansible/inventories/scigap/stagingnew/pga_config/interactwel/vault.yml b/dev-tools/ansible/inventories/scigap/stagingnew/pga_config/interactwel/vault.yml
deleted file mode 100644
index ba17f45..0000000
--- a/dev-tools/ansible/inventories/scigap/stagingnew/pga_config/interactwel/vault.yml
+++ /dev/null
@@ -1,18 +0,0 @@
-$ANSIBLE_VAULT;1.1;AES256
-31313962653038333233346562333836363230363038396437623564666663353439306531303232
-6163366537656630343566396633633036663238363336300a653763663262343363633136663432
-38333261363838653262613764353631633365373730656264616336643233323231653733626133
-6631613338623433360a636133643764336231373437623265323361643936636338393438663532
-33313335646365636631383936303531656633623439356164626365343932623534326132323137
-31353134343161636537623132356363623664346663316633306464613464353161333861366564
-39613331353035366462646138383635366565356138636231316365663835623165383139646564
-64636163653737383733626439316561316165356634623132323737666235353637623933633665
-66326562646635396363393934623661363466363632353163333139313937366534356165653838
-64363266363132393363323738613635663832346131343563366236643238626564353937316134
-62623863386530633961356532346431336436353237643930623334346262343434333735343664
-35636361653734363664363430623137383938303638366534633738626638623432653230613366
-37346265613165613862653730366136376332383839386237383332303535643834306637656233
-31343664336433663332636331303031363834363739313563663363393766643033356164626663
-61383738636636646234386333663136646434383637333865353663343831663761636435396363
-31626339643235633933623233333433366266386463616666646134623961343162386166643439
-6365
diff --git a/dev-tools/ansible/inventories/scigap/stagingnew/pga_config/iugateway/vars.yml b/dev-tools/ansible/inventories/scigap/stagingnew/pga_config/iugateway/vars.yml
deleted file mode 100644
index 033e037..0000000
--- a/dev-tools/ansible/inventories/scigap/stagingnew/pga_config/iugateway/vars.yml
+++ /dev/null
@@ -1,65 +0,0 @@
-#
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
----
-pga_repo: "https://github.com/apache/airavata-php-gateway.git"
-user: "pga"
-group: "pga"
-doc_root_dir: "/var/www/portals/iugateway"
-vhost_servername: "cybergateway.iu.edu"
-vhost_ssl: True
-# TODO: have Ansible manage these files as well
-ssl_certificate_file: "/etc/pki/tls/certs/cybergateway_iu_edu_cert.cer"
-ssl_certificate_chain_file: "/etc/pki/tls/certs/cybergateway_iu_edu_interm.cer"
-ssl_certificate_key_file: "/etc/pki/tls/private/iugateway.key"
-
-## Keycloak related variables
-tenant_domain: "{{ gateway_id }}"
-admin_username: "admin"
-admin_password: "{{ vault_admin_password }}"
-oauth_client_key: "{{ vault_oauth_client_key }}"
-oauth_client_secret: "{{ vault_oauth_client_secret }}"
-oidc_discovery_url: "https://iam.scigap.org/auth/realms/{{ tenant_domain }}/.well-known/openid-configuration"
-
-auth_options:
-  - name: "IU CAS"
-    oauth_grant_type: "authorization_code"
-    oauth_authorize_url_extra_params: "kc_idp_hint=cilogon"
-    logo: "/assets/cilogon-logo-24x24-b.png"
-# Since IU CAS is required for login, automatically give new users 'gateway-user' role
-initial_role_name: "gateway-user"
-oauth_callback_url: "https://{{ vhost_servername }}/callback-url"
-
-gateway_id: "iugateway"
-# relative to document root dir
-experiment_data_dir: "{{ user_data_dir }}/iugateway"
-gateway_data_store_resource_id: "gf4.ucs.indiana.edu_61552681-96f0-462a-a36c-a62a010bffc6"
-gateway_data_store_ssh_public_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCjKGnDVSWXJynfzyOOcACuXG8KdIaPvx1idpsMeioYAX+T+W2wK86tHfD2B9QxzmrcjvAZD7/GvTcMotBUQ+5nJyFyYkRDKL5XtC2HWaMijCmsGFgODfc+i3E274Cw9oYAamRPTCUShoqogd9jzW8gaIzTy+2sU5R/dYAUeiHM2ov9SpIJXNuCoT12R948iUd3b2amnBIJvy/DnhorLXz7MQ70l9cWQp986ZVOS32JRUZhk/2nLHQLxP9cwjP3kVXEtoaOZc3lwypOzdA/xJq4pRTb4s8mZ4SaQIzHBPBYneU85+P6j7cjlV3UeN+0YwvnXe1iWaoUuoUFrNmzudlf"
-
-## Portal related variables
-super_admin_portal: "false"
-admin_emails: "['athota@iu.edu', 'sgrc-iu-group@iu.edu']"
-portal_email_username: "pga.airavata@gmail.com"
-portal_email_password: "{{ vault_portal_email_password }}"
-portal_theme: "iugateway"
-portal_theme_repo: "https://github.com/SciGaP/iu-cybergateway-theme.git"
-portal_title: "IU Gateway"
-pga_google_analytics_id: "UA-111528347-9"
-...
diff --git a/dev-tools/ansible/inventories/scigap/stagingnew/pga_config/iugateway/vault.yml b/dev-tools/ansible/inventories/scigap/stagingnew/pga_config/iugateway/vault.yml
deleted file mode 100644
index feedb7f..0000000
--- a/dev-tools/ansible/inventories/scigap/stagingnew/pga_config/iugateway/vault.yml
+++ /dev/null
@@ -1,18 +0,0 @@
-$ANSIBLE_VAULT;1.1;AES256
-32666332356233373933633561646333376538313333633236333836313135386462643137623136
-3738633662633064393863353739376532386434363334640a336235626636653131323664323463
-31346366343861333661393930663061343864653766333030383764366135393466376438343934
-3361383733313236300a383464613164333837333632313739336361353134623565336335616537
-62643030333632313934306532663232323638323438623130376436646133666637646231663963
-33353037393431666239613037353132616232613863303565386632393533646563363139646338
-62383062653637663839373434393763633535653263383234616461613265306230383862333961
-64326637396331383132613539343131376238366266623664383032666461336137343966646463
-65316136386266393535613538653166346436616563393938316134616362343432373530663835
-37636562306336623363626635356537626366303133313463636533383234623132323932383931
-64363534616432323663366465346435303032633035313836376564383734623663636265316230
-39323666346261323534393634323464366661343133353133633733376230336662646432653535
-38303963666332333361633338303062383565623735656438323133663436636230333631376531
-31306235353364353261356636393738356463373037333163636531366161623631383763626538
-62643838356261656638656466653463656531616138646439316631663561306339326362356165
-63616263656365653762386265633566303731653662313363623761636566383034623064643232
-3466
diff --git a/dev-tools/ansible/inventories/scigap/stagingnew/pga_config/iugeosurvey/vars.yml b/dev-tools/ansible/inventories/scigap/stagingnew/pga_config/iugeosurvey/vars.yml
deleted file mode 100644
index 224c5a2..0000000
--- a/dev-tools/ansible/inventories/scigap/stagingnew/pga_config/iugeosurvey/vars.yml
+++ /dev/null
@@ -1,66 +0,0 @@
-#
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
----
-pga_repo: "https://github.com/apache/airavata-php-gateway.git"
-user: "pga"
-group: "pga"
-doc_root_dir: "/var/www/portals/{{ gateway_id }}"
-vhost_servername: "simccs.org"
-vhost_server_redirect: "geosurveyiu.scigap.org"
-vhost_ssl: true
-# TODO: have Ansible manage these files as well
-ssl_certificate_file: "/etc/letsencrypt/live/simccs.org/cert.pem"
-ssl_certificate_chain_file: "/etc/letsencrypt/live/simccs.org/fullchain.pem"
-ssl_certificate_key_file: "/etc/letsencrypt/live/simccs.org/privkey.pem"
-
-## Keycloak related variables
-tenant_domain: "{{ gateway_id }}"
-admin_username: "admin"
-admin_password: "{{ vault_admin_password }}"
-oauth_client_key: "{{ vault_oauth_client_key }}"
-oauth_client_secret: "{{ vault_oauth_client_secret }}"
-oidc_discovery_url: "https://iam.scigap.org/auth/realms/{{ tenant_domain }}/.well-known/openid-configuration"
-
-auth_options:
-  - name: "Indiana Geological Survey"
-    oauth_grant_type: "password"
-  - name: "Existing Institute Login"
-    oauth_grant_type: "authorization_code"
-    oauth_authorize_url_extra_params: "kc_idp_hint=cilogon"
-    logo: "/assets/cilogon-logo-24x24-b.png"
-oauth_callback_url: "https://{{ vhost_servername }}/callback-url"
-
-gateway_id: "iu-geology-survey"
-# relative to document root dir
-experiment_data_dir: "{{ user_data_dir }}/{{ gateway_id }}"
-gateway_data_store_resource_id: "gf4.ucs.indiana.edu_61552681-96f0-462a-a36c-a62a010bffc6"
-gateway_data_store_ssh_public_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDEuA1indjdczBXg2qrmD0bB0QfKq0u2q3o25DegTaty5LoogW+APEvXmwc2g6PzkM75MgfMsTErMQaQ3/PoElADQKg2/NePz05YWobn9zrPZFeRWfOqWMjFDx72cffHKBzgnahFDBlR/YJhf4IZJ+EOA1zMiMF2oZQmEYQtbQFhbKPF+jrScEQeuXVuXWSS2sKNAVKj3pY4kmi9kEOYELee/O6ghBUfrVhB95vDKJPgmQSuo3pgkLRdflTBSAQ54UchwjXi2RA9Xv0RXJF/JyyRGn6bSbRxYhsm5RJeiBVj4ua7p2b36rSYVqtVsTKEonx5kYdKzwyjJXWpjB2KtQp"
-
-## Portal related variables
-super_admin_portal: "false"
-admin_emails: "['sgrc-iu-group@iu.edu','wangyinz@indiana.edu','kmellett@indiana.edu','rkammer@indiana.edu']"
-portal_email_username: "pga.airavata@gmail.com"
-portal_email_password: "{{ vault_portal_email_password }}"
-portal_theme: "iu-geosurvey-gateway-theme"
-portal_theme_repo: "https://github.com/SciGaP/iu-geosurvey-gateway-theme.git"
-portal_title: "Indiana Geological Survey"
-pga_google_analytics_id: "UA-130065143-1"
-...
diff --git a/dev-tools/ansible/inventories/scigap/stagingnew/pga_config/iugeosurvey/vault.yml b/dev-tools/ansible/inventories/scigap/stagingnew/pga_config/iugeosurvey/vault.yml
deleted file mode 100644
index fc2f7c5..0000000
--- a/dev-tools/ansible/inventories/scigap/stagingnew/pga_config/iugeosurvey/vault.yml
+++ /dev/null
@@ -1,18 +0,0 @@
-$ANSIBLE_VAULT;1.1;AES256
-66636531313965303866643038636339303766383030653235633538623237323036336434336435
-6330396632636337383531376536393964333361656163390a323064393931376165373038323437
-39313937363536663364633562666639303964393533333138383333363837376335386261303665
-3031346366663730370a613937303739323839303633303164373466386239613436643737653266
-36346630326130646664626231613737333636613032633339643961336564313036383366356164
-66383439326331316336313437393537626139323066356366383366613437303866323638363831
-39373561653365626664326431363562333037616538303234313762633262663631633832646338
-63316335356161343134663366643037633666366563386339353332346261333230393730316364
-36666530346530386536656332386135353138646533643465303266613166616161393038626461
-38613032643339393331626236643835653839353138323830346666333632336465363263366639
-63643738316237313134653038363266383161353862363332353262333166623736323734336339
-61333233343230373665346336393530613936636533643732613539333634396566313962386331
-64623062313161633265646535313334643563613365353439313935383239353334623030396230
-32343431636365353466653230643264363133326637323531663834633631303065613533663333
-36336432386131383062353065356434653233356361343533393462356361643363396261306431
-36316133353530376435643732653034356362333164373233376530383430303731333737646338
-3930
diff --git a/dev-tools/ansible/inventories/scigap/stagingnew/pga_config/kentucky/vars.yml b/dev-tools/ansible/inventories/scigap/stagingnew/pga_config/kentucky/vars.yml
deleted file mode 100644
index 8de262a..0000000
--- a/dev-tools/ansible/inventories/scigap/stagingnew/pga_config/kentucky/vars.yml
+++ /dev/null
@@ -1,64 +0,0 @@
-#
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
----
-pga_repo: "https://github.com/apache/airavata-php-gateway.git"
-user: "pga"
-group: "pga"
-doc_root_dir: "/var/www/portals/{{ gateway_id }}"
-vhost_servername: "hpcgateway.uky.edu"
-vhost_ssl: true
-# TODO: have Ansible manage these files as well
-ssl_certificate_file: "/etc/letsencrypt/live/hpcgateway.uky.edu/cert.pem"
-ssl_certificate_chain_file: "/etc/letsencrypt/live/hpcgateway.uky.edu/fullchain.pem"
-ssl_certificate_key_file: "/etc/letsencrypt/live/hpcgateway.uky.edu/privkey.pem"
-
-## Keycloak related variables
-tenant_domain: "{{ gateway_id }}"
-admin_username: "admin"
-admin_password: "{{ vault_admin_password }}"
-oauth_client_key: "{{ vault_oauth_client_key }}"
-oauth_client_secret: "{{ vault_oauth_client_secret }}"
-oidc_discovery_url: "https://iam.scigap.org/auth/realms/{{ tenant_domain }}/.well-known/openid-configuration"
-
-auth_options:
-  - name: "University of Kentucky HPC Gateway"
-    oauth_grant_type: "password"
-  - name: "CILogon"
-    oauth_grant_type: "authorization_code"
-    oauth_authorize_url_extra_params: "kc_idp_hint=cilogon"
-    logo: "/assets/cilogon-logo-24x24-b.png"
-oauth_callback_url: "https://{{ vhost_servername }}/callback-url"
-
-gateway_id: "university-of-kentucky-hpc-gateway"
-# relative to document root dir
-experiment_data_dir: "{{ user_data_dir }}/{{ gateway_id }}"
-gateway_data_store_resource_id: "gf4.ucs.indiana.edu_61552681-96f0-462a-a36c-a62a010bffc6"
-gateway_data_store_ssh_public_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC8nCMkOgELG+FgKIC5wTdGn6ZRlnCfhn5ebrpMDagXTM0lacLplKThhOg4EXFOjxGOW83f4HBjKBJXpqRUunCL053Foox9/xqtk6Sa7jwRugL0rIBQJC4hZiHin2W0zHseoIQtghz+AbyofjUABYxOCpbKUuR3plyVv/68iqZOscPmVDw2bS9MLBHRZI5BvZ8FwKSEtn7uEV+XXvI4FXaRQfTg/arbgLietD+y+EyxOkSW3PXtu4xvQ2e6AA9LTKn2fGLHS/atEXgS+pBxVKWcCgpOxUCgNq/F8OQWEVDGFG3Pz3b45n7O62YWUgbS1Jn+FQVRw5Pfb4P31+hF3EJX"
-
-## Portal related variables
-super_admin_portal: "false"
-admin_emails: "['sgrc-iu-group@iu.edu','vgazu2@uky.edu']"
-portal_email_username: "pga.airavata@gmail.com"
-portal_email_password: "{{ vault_portal_email_password }}"
-#portal_theme: "gsu-gateway-theme"
-#portal_theme_repo: "https://github.com/SciGaP/gsu-gateway-theme"
-portal_title: "University of Kentucky HPC Gateway"
-...
diff --git a/dev-tools/ansible/inventories/scigap/stagingnew/pga_config/kentucky/vault.yml b/dev-tools/ansible/inventories/scigap/stagingnew/pga_config/kentucky/vault.yml
deleted file mode 100644
index b7db014..0000000
--- a/dev-tools/ansible/inventories/scigap/stagingnew/pga_config/kentucky/vault.yml
+++ /dev/null
@@ -1,18 +0,0 @@
-$ANSIBLE_VAULT;1.1;AES256
-36313161393133313835623866376236353737363839633462333162353837373664666336316466
-3431353734333962633534323663333764373139623362320a613737643239346134303934613831
-33306465616138636235323432303865353231616261393466373264626264616366333765653462
-3861303765366362340a656135653530323238316538333137346163346164633061363530343364
-30336534666435343735306161666133326332306665656236373733303836326566663530646332
-39356561343134306631323966353263613637626139616635366337383536383934356365636262
-66613330386336316637323839663836306637353265373364303836613034363563333764383133
-61346162376564653832383836353931616436353563343962346661636439653231346134333266
-31303063353965383430393662313762386130663763303834343063643037663636346139616437
-61633330646631626363303834633532376565623464623166616261383638376235303836613235
-66383662323064623462663039653737326233666430326461313935393835636231303330393862
-62666534643739323234663138373334396438643861646135636238623335373437656638343133
-64383732346636383431633862346432336661333065396161313961646164316462366430623462
-32623030663533303630313331383463346636376239313632653431646262303531313764363063
-36326161626536643731343930313739373765653664333239613666343862616566323363326531
-33303430373861363064363064656364323162633563343566323232616433646435613838363438
-3731
diff --git a/dev-tools/ansible/inventories/scigap/stagingnew/pga_config/lsu/vars.yml b/dev-tools/ansible/inventories/scigap/stagingnew/pga_config/lsu/vars.yml
deleted file mode 100644
index 88a5ee3..0000000
--- a/dev-tools/ansible/inventories/scigap/stagingnew/pga_config/lsu/vars.yml
+++ /dev/null
@@ -1,56 +0,0 @@
-#
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
----
-pga_repo: "https://github.com/apache/airavata-php-gateway.git"
-user: "pga"
-group: "pga"
-doc_root_dir: "/var/www/portals/lsu"
-vhost_servername: "lsu.scigap.org"
-vhost_ssl: False
-
-## Keycloak related variables
-tenant_domain: "{{ gateway_id }}"
-admin_username: "lsuadmin"
-admin_password: "{{ vault_admin_password }}"
-oauth_client_key: "{{ vault_oauth_client_key }}"
-oauth_client_secret: "{{ vault_oauth_client_secret }}"
-oidc_discovery_url: "https://iam.scigap.org/auth/realms/{{ tenant_domain }}/.well-known/openid-configuration"
-
-auth_options:
-  - name: "LSU Cybergateway"
-    oauth_grant_type: "password"
-oauth_callback_url: "http://{{ vhost_servername }}/callback-url"
-
-gateway_id: "lsu"
-# relative to document root dir
-experiment_data_dir: "{{ user_data_dir }}/lsu"
-gateway_data_store_resource_id: "gf4.ucs.indiana.edu_61552681-96f0-462a-a36c-a62a010bffc6"
-gateway_data_store_ssh_public_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCjusb/NsMD1BRsb0A7CEYpaaoKY+RH9bkcGOCTtJMRYgtzenOaX9egIR7AtOH3eaWjr2221QU9IOTQj2S4ZhpnC6+/eO6Lx3zHbqzG78z7U7gX6IzDjjuwrQDeDLYGfd6RoDAZk+H2/pvoNGia/AnOXHU0+x1eF795TDbyVZvA+vtDPJ4EHUfbE8GG/QzTGK8IZqUBJUd+NSzcqTs/jzTetwunN1MnTHHDOCOEgYWDTia+TMECmEq/YNy0u8Uhu1TtmXUu/vyCwjnspWBNnWjiXf0tLEnZ10HnvmH15Yhh3OERKrACaU7JqNmPDj8Vc9YIAYK1bRjmh5OrYCtxiHVF"
-
-## Portal related variables
-super_admin_portal: "false"
-admin_emails: "['wfeinstein@lsu.edu','sgg@iu.edu']"
-portal_email_username: "pga.airavata@gmail.com"
-portal_email_password: "{{ vault_portal_email_password }}"
-portal_theme: "base"
-#portal_theme_repo: ""
-portal_title: "LSU Cybergateway"
-...
diff --git a/dev-tools/ansible/inventories/scigap/stagingnew/pga_config/lsu/vault.yml b/dev-tools/ansible/inventories/scigap/stagingnew/pga_config/lsu/vault.yml
deleted file mode 100644
index 735d624..0000000
--- a/dev-tools/ansible/inventories/scigap/stagingnew/pga_config/lsu/vault.yml
+++ /dev/null
@@ -1,18 +0,0 @@
-$ANSIBLE_VAULT;1.1;AES256
-39316362646133353464633236396535623636623437393530633664633235316562386361343434
-3264323939643539623937373933663437353533623836630a346433383234376539646163373964
-31366530646264356239623938646665353631313830366666306333316364623731363761643163
-6366316230623433620a396366346233343231393033323430633133663839343237326239333961
-39353337363831666438636235323633656132663463393033633063333639313939353933323638
-66376131346437326563616235616466656131656463653564336361643461646164333934393262
-63383762643663633735633434666662613361356436653832626661623637306538656333613466
-64336139306333313830656634343533353439356435633439663132343631383837373563323836
-31626635363465653363376561346136633930643463386638383363386236366662363964363439
-63313435343631616165366330623831396337636433303936313861346431343733363338373966
-64666363323733373736313739666637323130373361333734383032376135663632353837633639
-66663330646136646336653166383562303633373633663561663061643731653332363630613039
-31663063616530643034663862636339636230326434383435353162393863333234326135323864
-64306339613061626637336233623632653133323239663164626534613033643262656566386635
-61646136393965663634393934376339653465626464386532613137653237333639353063643931
-62393232346336633263383064363333613530346564316534373862376535353463643439363661
-3439
diff --git a/dev-tools/ansible/inventories/scigap/stagingnew/pga_config/mines/vars.yml b/dev-tools/ansible/inventories/scigap/stagingnew/pga_config/mines/vars.yml
deleted file mode 100644
index 99ecb22..0000000
--- a/dev-tools/ansible/inventories/scigap/stagingnew/pga_config/mines/vars.yml
+++ /dev/null
@@ -1,65 +0,0 @@
-#
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
----
-pga_repo: "https://github.com/apache/airavata-php-gateway.git"
-user: "pga"
-group: "pga"
-doc_root_dir: "/var/www/portals/{{ gateway_id }}"
-vhost_servername: "qusp.mines.edu"
-#vhost_serveralias: "www.mines.scigap.org"
-vhost_ssl: true
-# TODO: have Ansible manage these files as well
-ssl_certificate_file: "/etc/letsencrypt/live/qusp.mines.edu/cert.pem"
-ssl_certificate_chain_file: "/etc/letsencrypt/live/qusp.mines.edu/fullchain.pem"
-ssl_certificate_key_file: "/etc/letsencrypt/live/qusp.mines.edu/privkey.pem"
-
-## Keycloak related variables
-tenant_domain: "{{ gateway_id }}"
-admin_username: "admin"
-admin_password: "{{ vault_admin_password }}"
-oauth_client_key: "{{ vault_oauth_client_key }}"
-oauth_client_secret: "{{ vault_oauth_client_secret }}"
-oidc_discovery_url: "https://iam.scigap.org/auth/realms/{{ tenant_domain }}/.well-known/openid-configuration"
-
-auth_options:
-  - name: "Mines Quantum Simulation Gateway"
-    oauth_grant_type: "password"
-  - name: "Existing Institute Login"
-    oauth_grant_type: "authorization_code"
-    oauth_authorize_url_extra_params: "kc_idp_hint=cilogon"
-    logo: "/assets/cilogon-logo-24x24-b.png"
-oauth_callback_url: "https://{{ vhost_servername }}/callback-url"
-
-gateway_id: "mines"
-# relative to document root dir
-experiment_data_dir: "{{ user_data_dir }}/{{ gateway_id }}"
-gateway_data_store_resource_id: "gf4.ucs.indiana.edu_61552681-96f0-462a-a36c-a62a010bffc6"
-gateway_data_store_ssh_public_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCUEBwfmgyxXs1Yg3VOnBG7j/lTzwhQmc40PaWchTNM5xfWL1RnGQkVrSDIdSHZTIJ29DOfJxoLGlhdoK1vpGgBSbcdNEE/dVo/jpZbsKi5CNSOhMdYHmR4L3AjqS8sWxHu9kzkGuWhhmD2zDxA2lf3Aqs3rJvdvKJ97ZGToCbaQ0LamEy19B+Lj5ZF2ooyUWIx9kiqAZ7JmYllxCbWNnbdtnVl6TcHkVpF7PcXk92WUEB/0csAhcJ/ZxnQcWVglD4tNWjPLwEy8dAPPWkms+N8Ce/o+pPu58BBb9mDxDFkk4wAwjV17Lq3TpC+usxGItLvyUkttB2xPs6PoAxzwluL"
-
-## Portal related variables
-super_admin_portal: "false"
-admin_emails: "['sgrc-iu-group@iu.edu','matjones@mymail.mines.edu']"
-portal_email_username: "pga.airavata@gmail.com"
-portal_email_password: "{{ vault_portal_email_password }}"
-portal_theme: "qusp-gateway-theme"
-portal_theme_repo: "https://github.com/SciGaP/qusp-gateway-theme.git"
-portal_title: "Mines Quantum Simulation Gateway"
-...
diff --git a/dev-tools/ansible/inventories/scigap/stagingnew/pga_config/mines/vault.yml b/dev-tools/ansible/inventories/scigap/stagingnew/pga_config/mines/vault.yml
deleted file mode 100644
index 030763d..0000000
--- a/dev-tools/ansible/inventories/scigap/stagingnew/pga_config/mines/vault.yml
+++ /dev/null
@@ -1,18 +0,0 @@
-$ANSIBLE_VAULT;1.1;AES256
-64663334636139306362346536356234323066316639346233323461386363313131313562343438
-6363343532643830316466303038613631366562376530380a613937383931616233643531396238
-32653165383237363165663931633934373839373935623166323964386433373463343762343233
-3534303565366335330a316434363136303930623561623134333833336564393366316132376431
-61343238396665376132353864633537643439626432643832386130376234376662613132623937
-33376662353434303765363766653564373731396138363734663932343032366234343236326133
-30646134353862306631353664383664373431643363623633363837643937336338366161626635
-39643263393333343533656461336663663263626233343365666434663731633561343633313331
-35643031386264653237613034363638636234623532363133313139643133383161373563393631
-36383939343164613533653662336635363435613638623836323665646635356536663562313335
-35323339303963633138393930313431393639396136313166646331656163323364613163353230
-66633430356333636365313464643464333030653461646131663530363832633139313632613262
-34666236323132303636366134623538323663613765323531663236646337303936623736633136
-62623263623335333731373430636637636662333866656636653862643738393761306638613234
-63373432656661306236376133316136636231316434303563613433333936636439323366353733
-36363933663466626137346537353834366238353461306435393638343535633231633461373035
-3138
diff --git a/dev-tools/ansible/inventories/scigap/stagingnew/pga_config/nanoconfinement/vars.yml b/dev-tools/ansible/inventories/scigap/stagingnew/pga_config/nanoconfinement/vars.yml
deleted file mode 100644
index ca3b297..0000000
--- a/dev-tools/ansible/inventories/scigap/stagingnew/pga_config/nanoconfinement/vars.yml
+++ /dev/null
@@ -1,64 +0,0 @@
-#
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
----
-pga_repo: "https://github.com/apache/airavata-php-gateway.git"
-user: "pga"
-group: "pga"
-doc_root_dir: "/var/www/portals/nanoconfinement"
-vhost_servername: "nanoconfinement.sciencegateways.iu.edu"
-vhost_ssl: True
-# TODO: have Ansible manage these files as well
-ssl_certificate_file: "/etc/letsencrypt/live/nanoconfinement.sciencegateways.iu.edu/cert.pem"
-ssl_certificate_chain_file: "/etc/letsencrypt/live/nanoconfinement.sciencegateways.iu.edu/fullchain.pem"
-ssl_certificate_key_file: "/etc/letsencrypt/live/nanoconfinement.sciencegateways.iu.edu/privkey.pem"
-
-## Keycloak related variables
-tenant_domain: "{{ gateway_id }}"
-admin_username: "admin"
-admin_password: "{{ vault_admin_password }}"
-oauth_client_key: "{{ vault_oauth_client_key }}"
-oauth_client_secret: "{{ vault_oauth_client_secret }}"
-oidc_discovery_url: "https://iam.scigap.org/auth/realms/{{ tenant_domain }}/.well-known/openid-configuration"
-
-auth_options:
-  - name: "Nano Confinement"
-    oauth_grant_type: "password"
-  - name: "CILogon"
-    oauth_grant_type: "authorization_code"
-    oauth_authorize_url_extra_params: "kc_idp_hint=cilogon"
-    logo: "/assets/cilogon-logo-24x24-b.png"
-oauth_callback_url: "https://{{ vhost_servername }}/callback-url"
-
-gateway_id: "nanoconfinement"
-# relative to document root dir
-experiment_data_dir: "{{ user_data_dir }}/nanoconfinement"
-gateway_data_store_resource_id: "gf4.ucs.indiana.edu_61552681-96f0-462a-a36c-a62a010bffc6"
-gateway_data_store_ssh_public_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCIUqpKWHwawFHnbWvs6pie+fDA9NlqMZNvzil7e8FQz7543+FOzdTl/octACjGnSTwHewpyTe9sAUVcnq6VJ5XYtApR68zMasEzyCZUMWhMqEuxopRZcUGDJVcq5hD4RZcer3aMPWSVmXVCNJeT4EsB52Zp2DfDVgfaOOfY8Ga4mcR2IdOyizV8HWXTH6vWFK+dD1GoPY0ECikwlsF1QA0vzqAcb1NYOTc70hZ9Pb0/78XF790joZ80hRsHGIc7IfncoLgRUkKSkMaoXbfy/tbqf76V0ZxaQOgayaLGF19oBlREO6ZQ3rDCOWgVJC32dCwAsaL9qWd0IZrprUEUQOd"
-
-## Portal related variables
-super_admin_portal: "false"
-admin_emails: "['smarru@iu.edu','sgg@iu.edu','vjadhao@iu.edu']"
-portal_email_username: "pga.airavata@gmail.com"
-portal_email_password: "{{ vault_portal_email_password }}"
-portal_theme: "nanoconfinement-gateway-theme"
-portal_theme_repo: "https://github.com/softmaterialslab/nanoconfinement-gateway-theme.git"
-portal_title: "Nano Confinement Science Gateway"
-...
diff --git a/dev-tools/ansible/inventories/scigap/stagingnew/pga_config/nanoconfinement/vault.yml b/dev-tools/ansible/inventories/scigap/stagingnew/pga_config/nanoconfinement/vault.yml
deleted file mode 100644
index b49412a..0000000
--- a/dev-tools/ansible/inventories/scigap/stagingnew/pga_config/nanoconfinement/vault.yml
+++ /dev/null
@@ -1,17 +0,0 @@
-$ANSIBLE_VAULT;1.1;AES256
-35383731646164393736643035333437666262376132376163383936303934366336616535356365
-3830393966393831343838353166333262646138383239340a633032396161373736646332306535
-35393032353263306534386237636662633030353064363638643637653865306534613239326165
-3364373735336361620a386336373634666334323438633733386432353464386564373862623838
-63333239303637386531306162396663633930316531323161343734333162643236623631363664
-62313462643836663138643236323638386139656433383063653831363137313231323965393237
-66306534663035323565373334363739323237323230623835343037323763353635383438323463
-38313436383935363463633730376362666138316632643137323461663639636465353632646264
-61313632643663346162396463626234326265323931623165393565653237316263353331616633
-30303663646533363066313161333139356166326265646630333339666131363633353031646438
-30333231383938316239333035306166383135313664353431633937653262303631373161353062
-65376131636363306131623735323865333766653837366132373362366330386238313162363262
-38623866356666306136316334663666306332366530313862353831366434303164353338643832
-35653230366537666133336436323638623135656365653763313363363439353936383964313336
-37633664373634656365303332663335663334346632363239613764353561333534626561363661
-63663366356530303034
diff --git a/dev-tools/ansible/inventories/scigap/stagingnew/pga_config/nanoshape/vars.yml b/dev-tools/ansible/inventories/scigap/stagingnew/pga_config/nanoshape/vars.yml
deleted file mode 100644
index 60eec0d..0000000
--- a/dev-tools/ansible/inventories/scigap/stagingnew/pga_config/nanoshape/vars.yml
+++ /dev/null
@@ -1,64 +0,0 @@
-#
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
----
-pga_repo: "https://github.com/apache/airavata-php-gateway.git"
-user: "pga"
-group: "pga"
-doc_root_dir: "/var/www/portals/nanoshape"
-vhost_servername: "nanoshape.sciencegateways.iu.edu"
-vhost_ssl: True
-# TODO: have Ansible manage these files as well
-ssl_certificate_file: "/etc/letsencrypt/live/nanoshape.sciencegateways.iu.edu/cert.pem"
-ssl_certificate_chain_file: "/etc/letsencrypt/live/nanoshape.sciencegateways.iu.edu/fullchain.pem"
-ssl_certificate_key_file: "/etc/letsencrypt/live/nanoshape.sciencegateways.iu.edu/privkey.pem"
-
-## Keycloak related variables
-tenant_domain: "{{ gateway_id }}"
-admin_username: "admin"
-admin_password: "{{ vault_admin_password }}"
-oauth_client_key: "{{ vault_oauth_client_key }}"
-oauth_client_secret: "{{ vault_oauth_client_secret }}"
-oidc_discovery_url: "https://iam.scigap.org/auth/realms/{{ tenant_domain }}/.well-known/openid-configuration"
-
-auth_options:
-  - name: "Nano Shape"
-    oauth_grant_type: "password"
-  - name: "CILogon"
-    oauth_grant_type: "authorization_code"
-    oauth_authorize_url_extra_params: "kc_idp_hint=cilogon"
-    logo: "/assets/cilogon-logo-24x24-b.png"
-oauth_callback_url: "https://{{ vhost_servername }}/callback-url"
-
-gateway_id: "nano-shape"
-# relative to document root dir
-experiment_data_dir: "{{ user_data_dir }}/nanoshape"
-gateway_data_store_resource_id: "gf4.ucs.indiana.edu_61552681-96f0-462a-a36c-a62a010bffc6"
-gateway_data_store_ssh_public_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCdnkbcATgISewsDfUJaDwsQSswt7cWM//ONfTLhxlvFHe1NFdVk65of/tOwXIjp+037tpMMv8Pi3bc4OUmdlv3P9tPOBoDNoOb+CUpJ/6skEkiH+zgO+zLetVHLIS/UdgcSL7xdbj5RfoT13ksyRvdVYLGLq2S1t7p0s//FKcw7qdw/S2N3YiCQPpHq45C/r4GTHzRaIksiE2WnsuRbk0CmazIQDXwedFadJCUqM4SrFOdxGos9b++d1yS+I9GrVya/xDRtpDzWCpUrNPJc0BzRp1qIkUnmh52uApKyfJX82gMbAn62xmTZytdgk6BA3Za96lVvjJQ4CsD2wpS7qpp"
-
-## Portal related variables
-super_admin_portal: "false"
-admin_emails: "['smarru@iu.edu','sgg@iu.edu','vjadhao@iu.edu']"
-portal_email_username: "pga.airavata@gmail.com"
-portal_email_password: "{{ vault_portal_email_password }}"
-portal_theme: "nanoshape-gateway-theme"
-portal_theme_repo: "https://github.com/softmaterialslab/nanoshape-gateway-theme.git"
-portal_title: "Nano Shape Science Gateway"
-...
diff --git a/dev-tools/ansible/inventories/scigap/stagingnew/pga_config/nanoshape/vault.yml b/dev-tools/ansible/inventories/scigap/stagingnew/pga_config/nanoshape/vault.yml
deleted file mode 100644
index e628705..0000000
--- a/dev-tools/ansible/inventories/scigap/stagingnew/pga_config/nanoshape/vault.yml
+++ /dev/null
@@ -1,18 +0,0 @@
-$ANSIBLE_VAULT;1.1;AES256
-37326565363634636561353861386430323939653634353334303965363765663563393333373966
-3863653537663931306530333165363932613962373236360a663961363361383838303132363132
-64376235656137323732363030333138323539653838343866393464646331303565326563393862
-6561313339666664640a323831616134306564306634383266383264353034336630646432356638
-38313037623138366632633836636238663334623933323535383238636334326364663565633761
-61393761353334343761333036373362363161356162333438623036313061613063376333643539
-38303934353932383963643935386633623530343737353436306539316334366539633861616566
-36353665323061333463363230376234643535306566306563353662646263646433646136663364
-31633531613430663035373165313165633066376433303663383261383665336438623339313837
-32366266313765386339653634303136363765366263383032646134613932303634383139313332
-64376531393835643830656536636264643530306436393361356362396562356365643833363535
-31616430353236316262353863643863626532656139343339313033303066363564393461623130
-39366162343865663738336636373339656665353063393262666536316130373231343066386632
-33353130643731346232333837393037326563323763656438333662303763663364663730386136
-30623062623762386331326266623361336565626534623937393262363834663534633561613233
-35363634376535343461643230653635616335346332356538643133333037653233343563373232
-3638
diff --git a/dev-tools/ansible/inventories/scigap/stagingnew/pga_config/newmexicostate/vars.yml b/dev-tools/ansible/inventories/scigap/stagingnew/pga_config/newmexicostate/vars.yml
deleted file mode 100644
index a544f44..0000000
--- a/dev-tools/ansible/inventories/scigap/stagingnew/pga_config/newmexicostate/vars.yml
+++ /dev/null
@@ -1,64 +0,0 @@
-#
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
----
-pga_repo: "https://github.com/apache/airavata-php-gateway.git"
-user: "pga"
-group: "pga"
-doc_root_dir: "/var/www/portals/new-mexico-state"
-vhost_servername: "sciencegateway.nmsu.edu"
-vhost_ssl: True
-# TODO: have Ansible manage these files as well
-ssl_certificate_file: "/etc/letsencrypt/live/sciencegateway.nmsu.edu/cert.pem"
-ssl_certificate_chain_file: "/etc/letsencrypt/live/sciencegateway.nmsu.edu/fullchain.pem"
-ssl_certificate_key_file: "/etc/letsencrypt/live/sciencegateway.nmsu.edu/privkey.pem"
-
-## Keycloak related variables
-tenant_domain: "{{ gateway_id }}"
-admin_username: "admin"
-admin_password: "{{ vault_admin_password }}"
-oauth_client_key: "{{ vault_oauth_client_key }}"
-oauth_client_secret: "{{ vault_oauth_client_secret }}"
-oidc_discovery_url: "https://iam.scigap.org/auth/realms/{{ tenant_domain }}/.well-known/openid-configuration"
-
-auth_options:
-  - name: "New Mexico State Science Gateway"
-    oauth_grant_type: "password"
-  - name: "Your Institution Login"
-    oauth_grant_type: "authorization_code"
-    oauth_authorize_url_extra_params: "kc_idp_hint=cilogon"
-    logo: "/assets/cilogon-logo-24x24-b.png"
-oauth_callback_url: "https://{{ vhost_servername }}/callback-url"
-
-gateway_id: "new-mexico-state"
-# relative to document root dir
-experiment_data_dir: "{{ user_data_dir }}/new-mexico-state"
-gateway_data_store_resource_id: "gf4.ucs.indiana.edu_61552681-96f0-462a-a36c-a62a010bffc6"
-gateway_data_store_ssh_public_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCRYbUBGqEqUkcsAkQPetJDTTIWGGFbB7DBzvSQUT26SqHpRZQR3J4lCvzmH8/T3KoQC4uxnph5RpiemMeoQIxIJ8hH9Pod3Z0xK2qu6b/jDrbX+UbepkBl8Xc8aE6UWAX4C6rnn1X4ktqLp9GDE2G9CN4+pZxDanK5h7+68qsiz/rpzUEHVDPzo1A5YRPE2cFgOp4s207zE/GaXH2A/+vucdbTmoy2hND3uYkaaMe4ygMlakDDlkMTl5dlgaHuoqVu0pOSnsUimpxV87LpXqWaD1d6G+IVW1CNjKtVBvz/z4aFMLWhqWLYZlLpsoGi4ZqXf3u0A4ajL+6uXgiGuIRX"
-
-## Portal related variables
-super_admin_portal: "false"
-admin_emails: "['sgg@iu.edu', 'dugasdvt@ad.nmsu.edu']"
-portal_email_username: "pga.airavata@gmail.com"
-portal_email_password: "{{ vault_portal_email_password }}"
-#portal_theme: "gsu-gateway-theme"
-#portal_theme_repo: "https://github.com/SciGaP/gsu-gateway-theme"
-portal_title: "New Mexico State Science Gateway"
-...
diff --git a/dev-tools/ansible/inventories/scigap/stagingnew/pga_config/newmexicostate/vault.yml b/dev-tools/ansible/inventories/scigap/stagingnew/pga_config/newmexicostate/vault.yml
deleted file mode 100644
index 5d17cd8..0000000
--- a/dev-tools/ansible/inventories/scigap/stagingnew/pga_config/newmexicostate/vault.yml
+++ /dev/null
@@ -1,18 +0,0 @@
-$ANSIBLE_VAULT;1.1;AES256
-64613132613630656638656166613930333366313665383361393130633164633231333932303838
-6438616530626438636131623839303839333366383737630a313238633630323935316330303735
-66373631393039313238633165393330633337393665343332373065666166643235636539303865
-3563653462633766300a626233373030646561613632306331346464666135383565343732363462
-33316635383534346634346137323433343239366662333762356534396233346665376666306638
-61336332636361333566366366326161636130306439656639316165353065363430666231333062
-39376563353862333262656235313763303636396235313661333564383437323531376332326161
-64616566373739666238303531393339643338633262316335396433626133353339643239343863
-36353965623739333833643335336662396164303866333832666166393836356663353331323261
-35653761663035373039653434653462363433323066323235616264346562643661373436393939
-38336134646334333166656136303132333065356633356664323066363031336333656532373931
-66633837633937323539643039356137366638346362323761343234343664386130393734333165
-37356139636664353534353665666535306365636165363830633236343535313138336435343736
-64343862303863666138303066626366623362313962363438376533613333353739633765326464
-36306337386138643036316237646236636633373163366238303763646663613533646139333464
-38373335373466313865663465663836396331633963613331656135653836313861333831343262
-3564
diff --git a/dev-tools/ansible/inventories/scigap/stagingnew/pga_config/nexttdb/vars.yml b/dev-tools/ansible/inventories/scigap/stagingnew/pga_config/nexttdb/vars.yml
deleted file mode 100644
index 446aed4..0000000
--- a/dev-tools/ansible/inventories/scigap/stagingnew/pga_config/nexttdb/vars.yml
+++ /dev/null
@@ -1,65 +0,0 @@
-#
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
----
-pga_repo: "https://github.com/apache/airavata-php-gateway.git"
-user: "pga"
-group: "pga"
-doc_root_dir: "/var/www/portals/{{ gateway_id }}"
-vhost_servername: "nexttdb.sciencegateway.scigap.org"
-vhost_ssl: true
-# TODO: have Ansible manage these files as well
-ssl_certificate_file: "/etc/letsencrypt/live/nexttdb.sciencegateway.scigap.org/cert.pem"
-ssl_certificate_chain_file: "/etc/letsencrypt/live/nexttdb.sciencegateway.scigap.org/fullchain.pem"
-ssl_certificate_key_file: "/etc/letsencrypt/live/nexttdb.sciencegateway.scigap.org/privkey.pem"
-
-## Keycloak related variables
-tenant_domain: "{{ gateway_id }}"
-admin_username: "admin"
-admin_password: "{{ vault_admin_password }}"
-oauth_client_key: "{{ vault_oauth_client_key }}"
-oauth_client_secret: "{{ vault_oauth_client_secret }}"
-oidc_discovery_url: "https://iam.scigap.org/auth/realms/{{ tenant_domain }}/.well-known/openid-configuration"
-
-auth_options:
-  - name: "NextGen Thermodynamics Gateway"
-    oauth_grant_type: "password"
-  - name: "University Account"
-    oauth_grant_type: "authorization_code"
-    oauth_authorize_url_extra_params: "kc_idp_hint=cilogon"
-    logo: "/assets/cilogon-logo-24x24-b.png"
-oauth_callback_url: "https://{{ vhost_servername }}/callback-url"
-
-gateway_id: "nexttdb"
-# relative to document root dir
-experiment_data_dir: "{{ user_data_dir }}/{{ gateway_id }}"
-gateway_data_store_resource_id: "gf4.ucs.indiana.edu_61552681-96f0-462a-a36c-a62a010bffc6"
-gateway_data_store_ssh_public_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC9jXb9oP4qh3S5Au98nYyV6rOfBXgnvq2asVuapb+a2zyzKKXVxl254IKvFC709F3U9i0re/Z+FQO9qDPZFAgQLps8anyE6+xKuU0DUvzk76OVX/ZMlHfSyRFqKuDBIln02M5rM6qLEUjh7INk1y6z0D1kPW3TsU7w7uY66k4FSAX9qAEZlemy4oCCIQVrege4ZWYSd02H/jXm6j6z7XPI63UbXhpFbZHwdGEAeiQaaas9fDDsy33lN66fC39qV80R5A/7rYQwhyfL1V3wic97lplNyPdZ2fGSUUtFLZxOtJQ1IhDq6kCSYVgQg8U3QviJ5QlYs2CSusshcWUkIZQ/"
-
-## Portal related variables
-super_admin_portal: "false"
-admin_emails: "['sgrc-iu-group@iu.edu','chenzhu@indiana.edu']"
-portal_email_username: "pga.airavata@gmail.com"
-portal_email_password: "{{ vault_portal_email_password }}"
-#portal_theme: "gsu-gateway-theme"
-#portal_theme_repo: "https://github.com/SciGaP/gsu-gateway-theme"
-portal_title: "NextGen Thermodynamics Gateway"
-pga_google_analytics_id: "UA-130014168-1"
-...
diff --git a/dev-tools/ansible/inventories/scigap/stagingnew/pga_config/nexttdb/vault.yml b/dev-tools/ansible/inventories/scigap/stagingnew/pga_config/nexttdb/vault.yml
deleted file mode 100644
index 20cade8..0000000
--- a/dev-tools/ansible/inventories/scigap/stagingnew/pga_config/nexttdb/vault.yml
+++ /dev/null
@@ -1,18 +0,0 @@
-$ANSIBLE_VAULT;1.1;AES256
-33626332393264303538663364323266353738643164613362346261316336643739393937396164
-6132303065653534646365323339343165623634333532330a633165653238333564613166373761
-37316562386664336635333738393236383733633338363430623564383365366566323734646632
-3065333039333034330a633065373464373064346262303566376533306230356138333964363364
-37646262383334666464653138633633623635623636313038386264336332633037346432353837
-38643863303763356463613938353435306132303838323936636336333863643934323230333462
-34386637366633373130646537653839666635383133373338623935376164383535313762633763
-30663038343734666466633461306437366461663232623333643866616537333765633932613562
-31653761623134393130326537633239306164643763343731366139613939313236356534313739
-30356666656565373331616462303330346130326435313933633764623466313739633762353662
-33646363343935616264353439346635333834343365383737653438313030626332393832333633
-35383465663861613335316637363266666463643037633031366133616533316130346261343466
-38306337653835643633623635346231373738336238343533356235323030656162626336316461
-36653663643334656437646330626133613065653037303637316164653832306235366266323065
-32363066613163633533643037356134636430613231343333633739616132353934306638616336
-62653030393133333964306334383866363064333561363662656362316432636563633432613037
-6262
diff --git a/dev-tools/ansible/inventories/scigap/stagingnew/pga_config/oscer/vars.yml b/dev-tools/ansible/inventories/scigap/stagingnew/pga_config/oscer/vars.yml
deleted file mode 100644
index 25af92c..0000000
--- a/dev-tools/ansible/inventories/scigap/stagingnew/pga_config/oscer/vars.yml
+++ /dev/null
@@ -1,64 +0,0 @@
-#
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
----
-pga_repo: "https://github.com/apache/airavata-php-gateway.git"
-user: "pga"
-group: "pga"
-doc_root_dir: "/var/www/portals/oscer"
-vhost_servername: "sciencegateway.oscer.ou.edu"
-vhost_ssl: True
-# TODO: have Ansible manage these files as well
-ssl_certificate_file: "/etc/letsencrypt/live/sciencegateway.oscer.ou.edu/cert.pem"
-ssl_certificate_chain_file: "/etc/letsencrypt/live/sciencegateway.oscer.ou.edu/fullchain.pem"
-ssl_certificate_key_file: "/etc/letsencrypt/live/sciencegateway.oscer.ou.edu/privkey.pem"
-
-## Keycloak related variables
-tenant_domain: "{{ gateway_id }}"
-admin_username: "admin"
-admin_password: "{{ vault_admin_password }}"
-oauth_client_key: "{{ vault_oauth_client_key }}"
-oauth_client_secret: "{{ vault_oauth_client_secret }}"
-oidc_discovery_url: "https://iam.scigap.org/auth/realms/{{ tenant_domain }}/.well-known/openid-configuration"
-
-auth_options:
-  - name: "OU Science Gateway"
-    oauth_grant_type: "password"
-  - name: "CILogon"
-    oauth_grant_type: "authorization_code"
-    oauth_authorize_url_extra_params: "kc_idp_hint=cilogon"
-    logo: "/assets/cilogon-logo-24x24-b.png"
-oauth_callback_url: "https://{{ vhost_servername }}/callback-url"
-
-gateway_id: "oscer"
-# relative to document root dir
-experiment_data_dir: "{{ user_data_dir }}/oscer"
-gateway_data_store_resource_id: "gf4.ucs.indiana.edu_61552681-96f0-462a-a36c-a62a010bffc6"
-gateway_data_store_ssh_public_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDZs3ErVmOoQ7GCRwsBJkh3BQVPaoeDw6cja67kXJPCBP7hQ1m9ld0h+PeIt/O8qwPgVN9kGf2fGeekJ9hTjAN8jk0xnU7og7F1RYg6+TqnugyfKZ22ZjfGf/tcc0Wd5BlokvMVJIsLCIv1N0OyxELrGi33y3U98egzn7r0j0uhtNZVN2AC4m1OpRJL7S9FRv9Z7CBXEs7x1j9ctyi3+Q8kBjWm7D78QPqCd2ODrHIDsPZpHm8CUOwHy9p7M+E2bbhkeGxExQhmBIFF75U4Lm3dzUzSmQGvUOppT+Nler8im7ArxS/8OJHEMOi4nW9J+BvtpDztQDAraJAX+VRNjaH5"
-
-## Portal related variables
-super_admin_portal: "false"
-admin_emails: "['smarru@iu.edu','sgg@iu.edu']"
-portal_email_username: "pga.airavata@gmail.com"
-portal_email_password: "{{ vault_portal_email_password }}"
-portal_theme: "oscer"
-portal_theme_repo: "https://github.com/SciGaP/ou-gateway-theme"
-portal_title: "OU Science Gateway"
-...
diff --git a/dev-tools/ansible/inventories/scigap/stagingnew/pga_config/oscer/vault.yml b/dev-tools/ansible/inventories/scigap/stagingnew/pga_config/oscer/vault.yml
deleted file mode 100644
index d96b100..0000000
--- a/dev-tools/ansible/inventories/scigap/stagingnew/pga_config/oscer/vault.yml
+++ /dev/null
@@ -1,17 +0,0 @@
-$ANSIBLE_VAULT;1.1;AES256
-39306166313062666130616632343032383866613163656166616534386339316330653235336637
-3631613163643364366133633339303362303261383938610a393732616163333539333665303533
-39366264656661373832643837383066323533346535316534373435613138633234626664623433
-3064333030653635380a346538303832313063633331393161386665343438613935666538333337
-35616333363430323334656461656335333961663634343138633237633265363534353064383363
-36646535623333316138613433336330336238643732666535623338343330393261366365633331
-34626363386135653564643530643430316439386331313333363333363064613764303134666630
-66356636613932643163393438396432616263373239346134633631393866386266333966623266
-65333666383630333265343130383963343839363461396638373363636461323337343765396334
-39356564393430333761653832313736666364336335636566663838643434326666326235616533
-36363033663932643833363466356635353136326531633833623463383132653464623331646236
-34313635313065323334323565363831303161623437623861346338343930326630353261306666
-32333438643864636234383033306363346330643935323962326133623066373433636362666534
-65333036643237623164363262373065633535323131386162386135343035353564346332313666
-36643066643639666631363161613038616238313938653139336464333463346530333130343837
-39633163336537373864
diff --git a/dev-tools/ansible/inventories/scigap/stagingnew/pga_config/pfec-hydro/vars.yml b/dev-tools/ansible/inventories/scigap/stagingnew/pga_config/pfec-hydro/vars.yml
deleted file mode 100644
index a192466..0000000
--- a/dev-tools/ansible/inventories/scigap/stagingnew/pga_config/pfec-hydro/vars.yml
+++ /dev/null
@@ -1,68 +0,0 @@
-#
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
----
-pga_repo: "https://github.com/apache/airavata-php-gateway.git"
-user: "pga"
-group: "pga"
-doc_root_dir: "/var/www/portals/{{ gateway_id }}"
-vhost_servername: "futurewater.indiana.edu"
-#vhost_serveralias: "www.mines.scigap.org"
-vhost_ssl: true
-# TODO: have Ansible manage these files as well
-ssl_certificate_file: "/etc/letsencrypt/live/futurewater.indiana.edu/cert.pem"
-ssl_certificate_chain_file: "/etc/letsencrypt/live/futurewater.indiana.edu/fullchain.pem"
-ssl_certificate_key_file: "/etc/letsencrypt/live/futurewater.indiana.edu/privkey.pem"
-
-php_upload_max_filesize: "6000M"
-php_post_max_size: "15000M"
-
-## Keycloak related variables
-tenant_domain: "{{ gateway_id }}"
-admin_username: "admin"
-admin_password: "{{ vault_admin_password }}"
-oauth_client_key: "{{ vault_oauth_client_key }}"
-oauth_client_secret: "{{ vault_oauth_client_secret }}"
-oidc_discovery_url: "https://iam.scigap.org/auth/realms/{{ tenant_domain }}/.well-known/openid-configuration"
-
-auth_options:
-  - name: "Future Water Gateway"
-    oauth_grant_type: "password"
-  - name: "Existing Institute Login"
-    oauth_grant_type: "authorization_code"
-    oauth_authorize_url_extra_params: "kc_idp_hint=cilogon"
-    logo: "/assets/cilogon-logo-24x24-b.png"
-oauth_callback_url: "https://{{ vhost_servername }}/callback-url"
-
-gateway_id: "pfec-hydro"
-# relative to document root dir
-experiment_data_dir: "{{ user_data_dir }}/{{ gateway_id }}"
-gateway_data_store_resource_id: "gf4.ucs.indiana.edu_61552681-96f0-462a-a36c-a62a010bffc6"
-gateway_data_store_ssh_public_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC9qczDIVUhTxPmMsvF2J/NGIWo35HDgm3IUL41w1bUi5FX3CzuKwWtBh6IGoY4l+ibvWiRw2w9+MLWPhAWglLjXXekHCc/C5LuU8qi6zGZgQfD6U4yFpHXmkZLUHt30iKbLJXgypy7MaQ4n3sWDXJe2Dbsc4FMSK+KXFQ5KNZ/meOCCurEswcDyz4Mrvf9ZSZWzq6vPTXtdHo+/oRMmiGNZqhcBkqIWfz5alzyq4HTAidz5uc6fD8mqj1hg87qywv6OwMUAxB84S8glcLs5ZzuTbpGl3sdftVH9zqabx6eAGXX9V389qdLp1k//u45ph+INOk11HFCCxmh/YmqQM9f"
-
-## Portal related variables
-super_admin_portal: "false"
-admin_emails: "['sgrc-iu-group@iu.edu','brandjen@iu.edu']"
-portal_email_username: "pga.airavata@gmail.com"
-portal_email_password: "{{ vault_portal_email_password }}"
-#portal_theme: "qusp-gateway-theme"
-#portal_theme_repo: "https://github.com/SciGaP/qusp-gateway-theme.git"
-portal_title: "Future Water Gateway"
-...
diff --git a/dev-tools/ansible/inventories/scigap/stagingnew/pga_config/pfec-hydro/vault.yml b/dev-tools/ansible/inventories/scigap/stagingnew/pga_config/pfec-hydro/vault.yml
deleted file mode 100644
index 1cf1e75..0000000
--- a/dev-tools/ansible/inventories/scigap/stagingnew/pga_config/pfec-hydro/vault.yml
+++ /dev/null
@@ -1,18 +0,0 @@
-$ANSIBLE_VAULT;1.1;AES256
-35303535323930643866396632346635626536353731353662333137386638316536346433363464
-3665303064663365343761333136343166373765663764350a396236366239393664336234396433
-39333066373865623035623439366432643536663161343664366131306530353765646364396630
-6536663836643861650a303139643431613264373135376331383765636663313362313464313834
-34333061303533396339626161623136313061643965353835633438383764333632316165323564
-64383436663835306130323734366336636132323034396537316166303861366635623635313839
-31663232323232616633386537343534613638613365373963333766356337646636346462323135
-36363865393438363731336639633739346438353139323865666139663164323532376165323438
-37393834343239643365383435353838636132616364336661623035393533353064646134306237
-37333931343335346239656164323038303539623231383963393461616166333334383132373861
-36326666313664346462376231386331383436396330313266363962633064383463316534393863
-66616433303733636133313936346233343739323163633666663330626138643536303366343862
-62326435316535636331313863373436386131396337306265666133323039323062666366643435
-66316562656162323438333836616131353732663635376235626133316434633239643830303439
-30393034623866373933393534346630373464626566343331346462623561353566373364343064
-36643832383364636339346539616135386463666639336231353837376562383537356130383263
-6534
diff --git a/dev-tools/ansible/inventories/scigap/stagingnew/pga_config/phasta/vars.yml b/dev-tools/ansible/inventories/scigap/stagingnew/pga_config/phasta/vars.yml
deleted file mode 100644
index 8b0de66..0000000
--- a/dev-tools/ansible/inventories/scigap/stagingnew/pga_config/phasta/vars.yml
+++ /dev/null
@@ -1,64 +0,0 @@
-#
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
----
-pga_repo: "https://github.com/apache/airavata-php-gateway.git"
-user: "pga"
-group: "pga"
-doc_root_dir: "/var/www/portals/phasta"
-vhost_servername: "phasta.scigap.org"
-vhost_ssl: True
-# TODO: have Ansible manage these files as well
-ssl_certificate_file: "/etc/letsencrypt/live/phasta.scigap.org/cert.pem"
-ssl_certificate_chain_file: "/etc/letsencrypt/live/phasta.scigap.org/fullchain.pem"
-ssl_certificate_key_file: "/etc/letsencrypt/live/phasta.scigap.org/privkey.pem"
-
-## Keycloak related variables
-tenant_domain: "{{ gateway_id }}"
-admin_username: "phasta_admin"
-admin_password: "{{ vault_admin_password }}"
-oauth_client_key: "{{ vault_oauth_client_key }}"
-oauth_client_secret: "{{ vault_oauth_client_secret }}"
-oidc_discovery_url: "https://iam.scigap.org/auth/realms/{{ tenant_domain }}/.well-known/openid-configuration"
-
-auth_options:
-  - name: "PHASTA"
-    oauth_grant_type: "password"
-  - name: "CILogon"
-    oauth_grant_type: "authorization_code"
-    oauth_authorize_url_extra_params: "kc_idp_hint=cilogon"
-    logo: "/assets/cilogon-logo-24x24-b.png"
-oauth_callback_url: "https://{{ vhost_servername }}/callback-url"
-
-gateway_id: "phasta"
-# relative to document root dir
-experiment_data_dir: "{{ user_data_dir }}/phasta"
-gateway_data_store_resource_id: "gf4.ucs.indiana.edu_61552681-96f0-462a-a36c-a62a010bffc6"
-gateway_data_store_ssh_public_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCIvxQcdWfZPnXgM1mU++kTuX2ydkQ5BxK0w4stY9qEwJDUoRxF6nstTFBEDkhS34/oBYsJIH9IM4UPxiiplwoIPSYRpqI24pmVNnfJakcsFmxeSVmQRI7SztedXca9IAn9DelJZyORonYsfbsYIDQNzAiMUVs+K9l4flZUqVIZwYrrKfDbd2StC3DUvCugKgJk+v+XsRUxGsebk8wqE273GYPtMt4bdTQFZMfCLg52pXUqrK8RTbL+WdB7uCVXAGC2vu7OsI5+BJSVVUUPiA3vS9oiuZS9qPAYEwowEs+RMl56sGLh5udvhMxaSDn4zqWKTo/LNXcO2p2Y9sit90LD"
-
-## Portal related variables
-super_admin_portal: "false"
-admin_emails: "['smithc11@rpi.edu','sgrc-iu-group@iu.edu']"
-portal_email_username: "pga.airavata@gmail.com"
-portal_email_password: "{{ vault_portal_email_password }}"
-portal_theme: "phasta"
-portal_theme_repo: "https://github.com/SciGaP/phasta-portal-theme.git"
-portal_title: "PHASTA Science Gateway"
-...
diff --git a/dev-tools/ansible/inventories/scigap/stagingnew/pga_config/phasta/vault.yml b/dev-tools/ansible/inventories/scigap/stagingnew/pga_config/phasta/vault.yml
deleted file mode 100644
index b54d3fe..0000000
--- a/dev-tools/ansible/inventories/scigap/stagingnew/pga_config/phasta/vault.yml
+++ /dev/null
@@ -1,18 +0,0 @@
-$ANSIBLE_VAULT;1.1;AES256
-61383161653963386234393034373861393862343136613266643731336662313464393261653761
-3839626462376235366233346334616439386236366235660a366636343164616138616363343263
-35643863613731366564656462363434393735666338323932356564326231353262353035643939
-3532336665376531350a316263343834343332386461363039656430313163643133376366303238
-66363839393965383662373636643035393835346535616461333730663837323739633338653635
-61343937363762643634383234386465623637323465633762323639373539303562626337303536
-37613964363739653638393032356163666337663938653033656335353937643138333634623439
-63323261363738303037616130663034646564623564616334613762636466656431306563343064
-62643039346138393262333066323338303164633163303561633235306534633733303734353135
-66666566323266313332343633643032653435623337656534303730353061656565623964346666
-36653436303935646264396664653963643664323566666461343437313935353039303238353336
-66653663353465393062666338326533396461333031356363373166653038356565643339613832
-61376139333934633230633532343634336162396334646464366366613137343931363862346530
-33653639633762643265613432643433643037623561653235303162373962393462383335376439
-64623161303033653235396234363632383236646362376235326138343563663134616565326236
-32386230313333656163323664633137636138666438343261313063363538323665613463303433
-3063
diff --git a/dev-tools/ansible/inventories/scigap/stagingnew/pga_config/r-hpc/vars.yml b/dev-tools/ansible/inventories/scigap/stagingnew/pga_config/r-hpc/vars.yml
deleted file mode 100644
index e4d8e63..0000000
--- a/dev-tools/ansible/inventories/scigap/stagingnew/pga_config/r-hpc/vars.yml
+++ /dev/null
@@ -1,64 +0,0 @@
-#
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
----
-pga_repo: "https://github.com/apache/airavata-php-gateway.git"
-user: "pga"
-group: "pga"
-doc_root_dir: "/var/www/portals/{{ gateway_id }}"
-vhost_servername: "r-hpc.scigap.org"
-#vhost_ssl: true
-# TODO: have Ansible manage these files as well
-#ssl_certificate_file: "/etc/letsencrypt/live/nexttdb.sciencegateway.scigap.org/cert.pem"
-#ssl_certificate_chain_file: "/etc/letsencrypt/live/nexttdb.sciencegateway.scigap.org/fullchain.pem"
-#ssl_certificate_key_file: "/etc/letsencrypt/live/nexttdb.sciencegateway.scigap.org/privkey.pem"
-
-## Keycloak related variables
-tenant_domain: "{{ gateway_id }}"
-admin_username: "admin"
-admin_password: "{{ vault_admin_password }}"
-oauth_client_key: "{{ vault_oauth_client_key }}"
-oauth_client_secret: "{{ vault_oauth_client_secret }}"
-oidc_discovery_url: "https://iam.scigap.org/auth/realms/{{ tenant_domain }}/.well-known/openid-configuration"
-
-auth_options:
-  - name: "R-HPC Gateway"
-    oauth_grant_type: "password"
-#  - name: "University Account" #CILogon
-#    oauth_grant_type: "authorization_code"
-#    oauth_authorize_url_extra_params: "kc_idp_hint=cilogon"
-#    logo: "/assets/cilogon-logo-24x24-b.png"
-oauth_callback_url: "https://{{ vhost_servername }}/callback-url"
-
-gateway_id: "r-hpc"
-# relative to document root dir
-experiment_data_dir: "{{ user_data_dir }}/{{ gateway_id }}"
-gateway_data_store_resource_id: "gf4.ucs.indiana.edu_61552681-96f0-462a-a36c-a62a010bffc6"
-gateway_data_store_ssh_public_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCq78vXnKfEBQleOpj3UGEZE9VDkUk8zO2grZ+u4gGdfV5Wx7jE0453PdQAdOjGxrusP5ERzWtwgg3myVRPGoq7cZOFL/7N96l1a+IxOZuJnEcL47EAGniOohl9NMnE0URWN8GA06Ou2pCHzraVhffG/QQocXPLaWbV2RU7dwh35AylBVBoxDWrcQ2xs+AZZjFtRg+XQouVbd6cVIuP0JtNQWOUZPKBb97XIoq28jl1bNcBLjiiSZ5ki8G5YgGwFD/aWXei8bX/iNfKWuiCgDXOuGH0yNs9j+SRyphkY+j1607ShUMcFxiLe7VBOztfgW/dCeyNkuMRhk6J8K8HgRGb"
-
-## Portal related variables
-super_admin_portal: "false"
-admin_emails: "['sgrc-iu-group@iu.edu']"
-portal_email_username: "pga.airavata@gmail.com"
-portal_email_password: "{{ vault_portal_email_password }}"
-#portal_theme: "gsu-gateway-theme"
-#portal_theme_repo: "https://github.com/SciGaP/gsu-gateway-theme"
-portal_title: "R-HPC Gateway"
-...
diff --git a/dev-tools/ansible/inventories/scigap/stagingnew/pga_config/r-hpc/vault.yml b/dev-tools/ansible/inventories/scigap/stagingnew/pga_config/r-hpc/vault.yml
deleted file mode 100644
index cfbc5a1..0000000
--- a/dev-tools/ansible/inventories/scigap/stagingnew/pga_config/r-hpc/vault.yml
+++ /dev/null
@@ -1,18 +0,0 @@
-$ANSIBLE_VAULT;1.1;AES256
-39353731393831333131653064366565326130643865363763376132356266316462366539663665
-3935303132633963643461356131373833303738333438370a316161303134383838626235616233
-34326238616663663635323363313365643438363639306538393866353637626432373037343064
-6564363739353436640a376661393036343737663030333233666462633035666562323231333336
-30633430346438613266656566653739353936353831643664363636383231306339396437653630
-35316166633437666535623061346231383463313535393866323635383865373030623265373037
-38616231366662636132666462623063346464303436316537346136396238373230306662383435
-62383262313830666162383164653865646334386662356230323963376230623462623037346632
-35653332323338383330346634643031393433373131363136353963323939376538616639613138
-34323836633439356332336336633139393365643866336565643736356361663734353661333165
-61633030343938613034363265336431323139343666393536313964643233346239363137306337
-31303239613236373336353032306665643337396135623563346164343038633065653039306436
-36646364316632383237393866613432633164343964346664633561626566366333336539663630
-36653237613861396561333539316232643635666630313330643337616136373037663361333037
-34373364643762383439666365373866343939373338386233386137343835366333663632643230
-63643066663332353263386635346631363863383064366138613731613763363334643266336139
-3665
diff --git a/dev-tools/ansible/inventories/scigap/stagingnew/pga_config/rutgersgemr/vars.yml b/dev-tools/ansible/inventories/scigap/stagingnew/pga_config/rutgersgemr/vars.yml
deleted file mode 100644
index f0e1cd3..0000000
--- a/dev-tools/ansible/inventories/scigap/stagingnew/pga_config/rutgersgemr/vars.yml
+++ /dev/null
@@ -1,64 +0,0 @@
-#
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
----
-pga_repo: "https://github.com/apache/airavata-php-gateway.git"
-user: "pga"
-group: "pga"
-doc_root_dir: "/var/www/portals/{{ gateway_id }}"
-vhost_servername: "gemr.scigap.org"
-vhost_ssl: true
-# TODO: have Ansible manage these files as well
-ssl_certificate_file: "/etc/letsencrypt/live/gemr.scigap.org/cert.pem"
-ssl_certificate_chain_file: "/etc/letsencrypt/live/gemr.scigap.org/fullchain.pem"
-ssl_certificate_key_file: "/etc/letsencrypt/live/gemr.scigap.org/privkey.pem"
-
-## Keycloak related variables
-tenant_domain: "{{ gateway_id }}"
-admin_username: "admin"
-admin_password: "{{ vault_admin_password }}"
-oauth_client_key: "{{ vault_oauth_client_key }}"
-oauth_client_secret: "{{ vault_oauth_client_secret }}"
-oidc_discovery_url: "https://iam.scigap.org/auth/realms/{{ tenant_domain }}/.well-known/openid-configuration"
-
-auth_options:
-  - name: "Prostate Cancer Prediction Gateway"
-    oauth_grant_type: "password"
-#  - name: "University Account" #CILogon
-#    oauth_grant_type: "authorization_code"
-#    oauth_authorize_url_extra_params: "kc_idp_hint=cilogon"
-#    logo: "/assets/cilogon-logo-24x24-b.png"
-oauth_callback_url: "https://{{ vhost_servername }}/callback-url"
-
-gateway_id: "prostate-cancer-prediction"
-# relative to document root dir
-experiment_data_dir: "{{ user_data_dir }}/{{ gateway_id }}"
-gateway_data_store_resource_id: "gf4.ucs.indiana.edu_61552681-96f0-462a-a36c-a62a010bffc6"
-gateway_data_store_ssh_public_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCaSojVxYa+6AS+jf+AyUnD0YqWisUeyiqjJ1Bi0p+d0FCAgxk2xyOX1m1eVvOLlxoL1KYzHV6cBqLyhSMMRsp1qiDrWkq9UdJiSywO/KvgjKfMrOrsgSj84BRo7ceJK5irAqeGIdAgDhGTJFuV+OEm+iDaRK1Om2QvkuGwEYQ1EZLY9H7JpGgU6Fw0Aoh4e2wYwp/RQ2QGNjc5EGddZJZil8W3NlibKJ+5Yl90kyX3s2tEUjQSBNYXcokUvc01ZdfAY3TUwQlTlMyJpjZyuTF8Ea4fw3p9sVHRNrLIyCmYHrMxGTNVapV5bk1NZd1LxhqRjhKvIP4kFNd7lW30k/sT"
-
-## Portal related variables
-super_admin_portal: "false"
-admin_emails: "['sgrc-iu-group@iu.edu','kp807@oarc.rutgers.edu']"
-portal_email_username: "pga.airavata@gmail.com"
-portal_email_password: "{{ vault_portal_email_password }}"
-#portal_theme: "gsu-gateway-theme"
-#portal_theme_repo: "https://github.com/SciGaP/gsu-gateway-theme"
-portal_title: "Prostate Cancer Prediction Gateway"
-...
diff --git a/dev-tools/ansible/inventories/scigap/stagingnew/pga_config/rutgersgemr/vault.yml b/dev-tools/ansible/inventories/scigap/stagingnew/pga_config/rutgersgemr/vault.yml
deleted file mode 100644
index 1800996..0000000
--- a/dev-tools/ansible/inventories/scigap/stagingnew/pga_config/rutgersgemr/vault.yml
+++ /dev/null
@@ -1,18 +0,0 @@
-$ANSIBLE_VAULT;1.1;AES256
-61663062663539336432393361613566383163633930653530623239626635303936333961316365
-6163373732306433363433613562303930346664336233640a316538386162303331663033373562
-65646336613539353937303164333737303966363931623439323436613432333839393233376631
-6236663365333531370a346662613666623065633862633061366531346437363461353733346462
-62346635366164323431613135646565303232323736346634666133613836633863333666393633
-62613439373930393062643137363936333262656531613238333133656431326636393131626533
-32303565623964623638613338623263316639353863366237663434346461383339313630643539
-66353735343339346666373234333739373563636264646661313938323938393233613862393637
-34386333663438663161306537333236636239616132346131633336363233396430613038633431
-63653262363930363566646463653237633265666534316364613964303132383965633164643431
-38393364646233313437393462383738323831663638313035373435303230623362643136376433
-39666333306564373831643635303438353035336462373037646263396331613164363366623630
-37633435363162643065373066386565373261313539613535643032303833613437306365666130
-61343035643037616464396538663566616230386464393231343830333136303634636531656635
-37623130643135376332313836623064353266363931663637356266613932643964646361343462
-66333537623164356331613962646563393861393739613032663261393334373439336430653664
-3030
diff --git a/dev-tools/ansible/inventories/scigap/stagingnew/pga_config/saverx/vars.yml b/dev-tools/ansible/inventories/scigap/stagingnew/pga_config/saverx/vars.yml
deleted file mode 100644
index fbde022..0000000
--- a/dev-tools/ansible/inventories/scigap/stagingnew/pga_config/saverx/vars.yml
+++ /dev/null
@@ -1,67 +0,0 @@
-#
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
----
-pga_repo: "https://github.com/apache/airavata-php-gateway.git"
-user: "pga"
-group: "pga"
-doc_root_dir: "/var/www/portals/{{ gateway_id }}"
-vhost_servername: "singlecellgateway.wharton.upenn.edu"
-vhost_ssl: true
-# TODO: have Ansible manage these files as well
-ssl_certificate_file: "/etc/letsencrypt/live/singlecellgateway.wharton.upenn.edu/cert.pem"
-ssl_certificate_chain_file: "/etc/letsencrypt/live/singlecellgateway.wharton.upenn.edu/fullchain.pem"
-ssl_certificate_key_file: "/etc/letsencrypt/live/singlecellgateway.wharton.upenn.edu/privkey.pem"
-
-php_upload_max_filesize: "2000M"
-php_post_max_size: "2500M"
-
-## Keycloak related variables
-tenant_domain: "{{ gateway_id }}"
-admin_username: "admin"
-admin_password: "{{ vault_admin_password }}"
-oauth_client_key: "{{ vault_oauth_client_key }}"
-oauth_client_secret: "{{ vault_oauth_client_secret }}"
-oidc_discovery_url: "https://iam.scigap.org/auth/realms/{{ tenant_domain }}/.well-known/openid-configuration"
-
-auth_options:
-  - name: "Saver-X Gateway"
-    oauth_grant_type: "password"
-  - name: "Existing Institute Login" #CILogon
-    oauth_grant_type: "authorization_code"
-    oauth_authorize_url_extra_params: "kc_idp_hint=cilogon"
-    logo: "/assets/cilogon-logo-24x24-b.png"
-oauth_callback_url: "https://{{ vhost_servername }}/callback-url"
-
-gateway_id: "saverx"
-# relative to document root dir
-experiment_data_dir: "{{ user_data_dir }}/{{ gateway_id }}"
-gateway_data_store_resource_id: "gf4.ucs.indiana.edu_61552681-96f0-462a-a36c-a62a010bffc6"
-gateway_data_store_ssh_public_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCN80RHzcW1GuYt8e1G4XJJmufZ4QBq5XRJB17jsIhuNcpCishLXiaL7eR0qnkPPi8vyuU0MqZ7R81IV9lSp1nnYOxge7DSTAzt+mo1Sfmg/sgeClo+RhH3ZDxsya4nTrVzkYvKzJsu2dD1o7TBZnfKSvq8EhwaYbO7+OgvGc21ZJQYDSq02HrRE4p7toTMNptQEPZTCFalppEMzljvnn5VNOiH9PJyxwSjUFcR7+PTCR0v0m0bkP9nCOz+orIYSrf+Jw1UJJJ6AE26vmeKfMsJjkhmM+cNUEiPiVm8ZoE8IM2tl4BcKofA5JxciH33jG9FH04qmahq4jtAScJS8ty/"
-
-## Portal related variables
-super_admin_portal: "false"
-admin_emails: "['sgrc-iu-group@iu.edu','Divyansh.Agarwal@pennmedicine.upenn.edu']"
-portal_email_username: "pga.airavata@gmail.com"
-portal_email_password: "{{ vault_portal_email_password }}"
-portal_theme: "saver-x-gateway-theme"
-portal_theme_repo: "https://github.com/SciGaP/saver-x-gateway-theme"
-portal_title: "Saver-X Gateway"
-...
diff --git a/dev-tools/ansible/inventories/scigap/stagingnew/pga_config/saverx/vault.yml b/dev-tools/ansible/inventories/scigap/stagingnew/pga_config/saverx/vault.yml
deleted file mode 100644
index c6d87d4..0000000
--- a/dev-tools/ansible/inventories/scigap/stagingnew/pga_config/saverx/vault.yml
+++ /dev/null
@@ -1,18 +0,0 @@
-$ANSIBLE_VAULT;1.1;AES256
-35656331636332346333316531383430616361633964306366613264656236633334383338626531
-3564656462633534303036666363353037303535366262360a326564363531313964653638303366
-36643939333239373765313230646364313632366232643539383837383163643030333365343765
-3638623739666361300a323435393038666635393164386232653839333464366463356562366337
-33633738303033613839393233353932656364623762393539373363643431316461643335643965
-65356363666236633538306362633838306632373931653932323261336334663335393837393365
-30363335393135666535343733333662323663653264353031356430616633346437373436313138
-38323632323230663437333661663662326263306265386166306161323038303164623132363265
-35616264363263633666353961303337663164326639386634393664313433313563386162663831
-30353033616165346263646461326338383066353763313961353364623234353934383866633038
-62613933613763333435653537373166353164323931353065346635346266366137313163393063
-32633964656531346266393533623037383431653837653538313063333137636337313038303138
-38366335626531373833316636633030363437316330333966633732356239376261386430343035
-38356531366431623635646332353938326639323166353639343362363166306663643963363264
-37343339346566626466346135333262313838653865336339306631306563336531343830623537
-36646264383566656666613836623762326466663830643339333236626661376664363933343365
-3538
diff --git a/dev-tools/ansible/inventories/scigap/stagingnew/pga_config/scigap/vars.yml b/dev-tools/ansible/inventories/scigap/stagingnew/pga_config/scigap/vars.yml
deleted file mode 100644
index 43c3b3c..0000000
--- a/dev-tools/ansible/inventories/scigap/stagingnew/pga_config/scigap/vars.yml
+++ /dev/null
@@ -1,71 +0,0 @@
-#
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
----
-pga_repo: "https://github.com/apache/airavata-php-gateway.git"
-user: "pga"
-group: "pga"
-doc_root_dir: "/var/www/portals/scigap"
-vhost_servername: "scigap.org"
-#vhost_servername: "beta.scigap.org"
-vhost_ssl: True
-# TODO: have Ansible manage these files as well
-ssl_certificate_file: "/etc/pki/tls/certs/scigap_org_cert.cer"
-ssl_certificate_chain_file: "/etc/pki/tls/certs/scigap_org_interm.cer"
-ssl_certificate_key_file: "/etc/pki/tls/private/scigap.key"
-#ssl_certificate_file: "/etc/letsencrypt/live/beta.scigap.org/cert.pem"
-#ssl_certificate_chain_file: "/etc/letsencrypt/live/beta.scigap.org/fullchain.pem"
-#ssl_certificate_key_file: "/etc/letsencrypt/live/beta.scigap.org/privkey.pem"
-
-## Keycloak related variables
-tenant_domain: "{{ gateway_id }}"
-admin_username: "scigap_admin"
-admin_password: "{{ vault_admin_password }}"
-oauth_client_key: "{{ vault_oauth_client_key }}"
-oauth_client_secret: "{{ vault_oauth_client_secret }}"
-# With Keycloak, we have to have static role names
-#user_role_name: "airavata-user"
-initial_role_name: "gateway-provider"
-oidc_discovery_url: "https://iam.scigap.org/auth/realms/{{ tenant_domain }}/.well-known/openid-configuration"
-
-auth_options:
-  - name: "SciGaP"
-    oauth_grant_type: "password"
-  - name: "CILogon"
-    oauth_grant_type: "authorization_code"
-    oauth_authorize_url_extra_params: "kc_idp_hint=cilogon"
-    logo: "/assets/cilogon-logo-24x24-b.png"
-oauth_callback_url: "https://{{ vhost_servername }}/callback-url"
-
-gateway_id: "scigap"
-# relative to document root dir
-experiment_data_dir: "{{ user_data_dir }}/scigap"
-gateway_data_store_resource_id: "gf4.ucs.indiana.edu_61552681-96f0-462a-a36c-a62a010bffc6"
-
-## Portal related variables
-super_admin_portal: "true"
-admin_emails: "['sgrc-iu-group@iu.edu']"
-portal_email_username: "pga.airavata@gmail.com"
-portal_email_password: "{{ vault_portal_email_password }}"
-portal_theme: "scigap"
-portal_theme_repo: "https://github.com/SciGaP/scigap-portal-theme"
-portal_title: "SciGaP Admin Portal"
-pga_google_analytics_id: "UA-111528347-4"
-...
diff --git a/dev-tools/ansible/inventories/scigap/stagingnew/pga_config/scigap/vault.yml b/dev-tools/ansible/inventories/scigap/stagingnew/pga_config/scigap/vault.yml
deleted file mode 100644
index fecaa71..0000000
--- a/dev-tools/ansible/inventories/scigap/stagingnew/pga_config/scigap/vault.yml
+++ /dev/null
@@ -1,18 +0,0 @@
-$ANSIBLE_VAULT;1.1;AES256
-37316430346432346631396330363763323036316131396463376232373137333631626664373435
-3432626264383530393434656264336631653433633637340a383161636134376230336233353232
-34366238613232393134663865626138613866623133616261373434653664313132323864336661
-6337356131643630360a343262646466393439313964353730653237386161346538383563396130
-65623231663331616634623463373231333633336633653138343730633839316530666633306266
-34653062386565666665616638633134616638363532613036616433626630326666636662383338
-30323237393763326364393265613937326565386330316165303366396466633866633438643166
-34613335623231303664363865393138343434333330393039393966323961383033653964343339
-38346635353465616139373037666636313266316637656534613063363130633833613733343430
-38306634363831633966356361366236666264346133323161626330623634326130343239623764
-38376336303663623261376133333833383633356436313134313837633730323034336161396564
-63393537306164393365343737393565613831303335323661623266393430663761626666623030
-36633531383665303835623031343133313665653437303465663334303135643264646436616566
-39383734396630356433313036333461633631616530373633396136643766616530653931363236
-37646237643030333634633739373932323064313536656566353135313939646138633636353737
-65323837346132363833333133323033646238393037653038646234316465333761336366323035
-3830
diff --git a/dev-tools/ansible/inventories/scigap/stagingnew/pga_config/sdstate/vars.yml b/dev-tools/ansible/inventories/scigap/stagingnew/pga_config/sdstate/vars.yml
deleted file mode 100644
index 2b11119..0000000
--- a/dev-tools/ansible/inventories/scigap/stagingnew/pga_config/sdstate/vars.yml
+++ /dev/null
@@ -1,65 +0,0 @@
-#
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
----
-pga_repo: "https://github.com/apache/airavata-php-gateway.git"
-user: "pga"
-group: "pga"
-doc_root_dir: "/var/www/portals/{{ gateway_id }}"
-vhost_servername: "sciencegateway.sdstate.edu"
-#vhost_serveralias: "www.mines.scigap.org"
-vhost_ssl: true
-# TODO: have Ansible manage these files as well
-ssl_certificate_file: "/etc/letsencrypt/live/sciencegateway.sdstate.edu/cert.pem"
-ssl_certificate_chain_file: "/etc/letsencrypt/live/sciencegateway.sdstate.edu/fullchain.pem"
-ssl_certificate_key_file: "/etc/letsencrypt/live/sciencegateway.sdstate.edu/privkey.pem"
-
-## Keycloak related variables
-tenant_domain: "{{ gateway_id }}"
-admin_username: "admin"
-admin_password: "{{ vault_admin_password }}"
-oauth_client_key: "{{ vault_oauth_client_key }}"
-oauth_client_secret: "{{ vault_oauth_client_secret }}"
-oidc_discovery_url: "https://iam.scigap.org/auth/realms/{{ tenant_domain }}/.well-known/openid-configuration"
-
-auth_options:
-  - name: "South Dakota State University Gateway"
-    oauth_grant_type: "password"
-  - name: "South Dakota Login"
-    oauth_grant_type: "authorization_code"
-    oauth_authorize_url_extra_params: "kc_idp_hint=sdsu"
-    logo: "/assets/cilogon-logo-24x24-b.png"
-oauth_callback_url: "https://{{ vhost_servername }}/callback-url"
-
-gateway_id: "sdstate"
-# relative to document root dir
-experiment_data_dir: "{{ user_data_dir }}/{{ gateway_id }}"
-gateway_data_store_resource_id: "gf4.ucs.indiana.edu_61552681-96f0-462a-a36c-a62a010bffc6"
-gateway_data_store_ssh_public_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC7vqwM+CWfqVWODe3iLsKN9leJ9nI+pKFZhrVUG8K/ODycXT5tQOxMhsC+HG6/wJ1W7+LeA6uvVnltnFlVozfTs2jeJzVQ71UvfUiZFVhXian3f8Nd4DXBvqPUY8dmhWP/UJCIKO47fSI/RC2ZlMa1K4yRYPdRgLRuSmtzG8Rb7YGVjkt1uDOLMh6hAS1KKpWVSxESFeqqoKj2xqOKBnbf2PdJt/D4/2R6H8D/WAM0cdZnls5fmiUysHK+bU8atzMukLQ6STglVv0WuqNGdAw6zWZH+Kaj8bP19jfkGCbMLP1vPYRkcxLmtnSzbg2Hams9npwdAA+xwwjuS6/tAX+p"
-
-## Portal related variables
-super_admin_portal: "false"
-admin_emails: "['sgrc-iu-group@iu.edu','Chad.Julius@sdstate.edu','Kevin.Brandt@sdstate.edu','luke.gassman@sdstate.edu']"
-portal_email_username: "pga.airavata@gmail.com"
-portal_email_password: "{{ vault_portal_email_password }}"
-#portal_theme: "searchingsra-gateway-theme"
-#portal_theme_repo: "https://github.com/SciGaP/gsu-gateway-theme"
-portal_title: "South Dakota State University Gateway"
-...
diff --git a/dev-tools/ansible/inventories/scigap/stagingnew/pga_config/sdstate/vault.yml b/dev-tools/ansible/inventories/scigap/stagingnew/pga_config/sdstate/vault.yml
deleted file mode 100644
index 1cae652..0000000
--- a/dev-tools/ansible/inventories/scigap/stagingnew/pga_config/sdstate/vault.yml
+++ /dev/null
@@ -1,18 +0,0 @@
-$ANSIBLE_VAULT;1.1;AES256
-64666537613865616361646632663165333064316664363838353031336363396461333466326131
-6434393231656338663233643163643636623431616365630a646336636663643738656264373135
-63353033613331333966666430646662643039333261386562643337393533656165313934356565
-6635303464343863390a343236316239343330393436343066363639636265393337356438336437
-39633432313339613634616363303334323239633365336362396661346530336564643734306134
-38326135633233316361323134346239393237343064326236613565373938623465623139383564
-35633136633336323332376338363162636165663635643839363138356337326430346465356635
-66626333396662373733366363343663663437363535383064633863666465373238663830656630
-31316432356237643165353930386465656335356661663537316332353038323337663833316164
-32396361353538613739336530356136303762343464656335613634353066333938646163633035
-37616636613535306433336636633562386266303232643038643465313933383266613862316239
-37333039343335666136363363623235623537386634303234613266306537633135326639346364
-66663337656230306565333736383432313134646663373239393265333237363631633033363737
-30356630343565383530353439373030613062663466626661616464366666613137333231323030
-65396362356563353232666230353835623166393332373361316631353938303365643839346131
-35333963626666393531643564616536303532643663363132383131323461653735306461383635
-3666
diff --git a/dev-tools/ansible/inventories/scigap/stagingnew/pga_config/seagrid/vars.yml b/dev-tools/ansible/inventories/scigap/stagingnew/pga_config/seagrid/vars.yml
deleted file mode 100644
index 1139c65..0000000
--- a/dev-tools/ansible/inventories/scigap/stagingnew/pga_config/seagrid/vars.yml
+++ /dev/null
@@ -1,76 +0,0 @@
-#
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
----
-pga_repo: "https://github.com/apache/airavata-php-gateway.git"
-user: "pga"
-group: "pga"
-doc_root_dir: "/var/www/portals/{{ gateway_id }}"
-vhost_servername: "seagrid.org"
-vhost_serveralias: "www.seagrid.org"
-#vhost_servername: "beta.seagrid.org"
-vhost_ssl: True
-# TODO: have Ansible manage these files as well
-ssl_certificate_file: "/etc/letsencrypt/live/seagrid.org/cert.pem"
-ssl_certificate_chain_file: "/etc/letsencrypt/live/seagrid.org/fullchain.pem"
-ssl_certificate_key_file: "/etc/letsencrypt/live/seagrid.org/privkey.pem"
-#ssl_certificate_file: "/etc/pki/tls/certs/seagrid_org_cert.cer"
-#ssl_certificate_chain_file: "/etc/pki/tls/certs/seagrid_org_interm.cer"
-#ssl_certificate_key_file: "/etc/pki/tls/private/portal.seagrid.key"
-#ssl_certificate_file: "/etc/letsencrypt/live/beta.seagrid.org/cert.pem"
-#ssl_certificate_chain_file: "/etc/letsencrypt/live/beta.seagrid.org/fullchain.pem"
-#ssl_certificate_key_file: "/etc/letsencrypt/live/beta.seagrid.org/privkey.pem"
-
-php_upload_max_filesize: "5000M"
-php_post_max_size: "5500M"
-
-## Keycloak related variables
-tenant_domain: "{{ gateway_id }}"
-admin_username: "admin"
-admin_password: "{{ vault_admin_password }}"
-oauth_client_key: "{{ vault_oauth_client_key }}"
-oauth_client_secret: "{{ vault_oauth_client_secret }}"
-oidc_discovery_url: "https://iam.scigap.org/auth/realms/{{ tenant_domain }}/.well-known/openid-configuration"
-
-auth_options:
-  - name: "SEAGrid"
-    oauth_grant_type: "password"
-  - name: "CILogon"
-    oauth_grant_type: "authorization_code"
-    oauth_authorize_url_extra_params: "kc_idp_hint=cilogon"
-    logo: "/assets/cilogon-logo-24x24-b.png"
-oauth_callback_url: "https://{{ vhost_servername }}/callback-url"
-
-gateway_id: "seagrid"
-# relative to document root dir
-experiment_data_dir: "{{ user_data_dir }}/seagrid"
-gateway_data_store_resource_id: "gf4.ucs.indiana.edu_61552681-96f0-462a-a36c-a62a010bffc6"
-gateway_data_store_ssh_public_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCApfdud3cJ7rx44M41gEKVgRfefk/Vd/7dIp9Xr9juX4jqmGuLoZR+hk287Hmbps6hZv23Av97XkCLldH0pueDekthcBDo4cRiQMDBp9NLz/9muqYVBl985psEbazYygagy/q/3ebi4CVEYVd4cHBee1V3GYyuJS2RklF0s/Otyf8x8auJSMniHGbTbVqtFlEOYuPdXlRBfH37k55N7+2iXKsIVvgn1MDweHEbQWJMx2LDCkLfJitreTiwcuST55w6N/n8WYZM2t+ie3BJEr6tcGAVIuyxj7CbMYMziM/hM5J+oQGPY/IBtiNZoxiZ0DeAC9SiEvE9fbTEW2iRWnQL"
-
-## Portal related variables
-super_admin_portal: "false"
-admin_emails: "['pamidigs@iu.edu', 'sgrc-iu-group@iu.edu']"
-portal_email_username: "pga.airavata@gmail.com"
-portal_email_password: "{{ vault_portal_email_password }}"
-portal_theme: "seagrid"
-portal_theme_repo: "https://github.com/SciGaP/seagrid-website-theme.git"
-portal_title: "SEAGrid Portal"
-pga_google_analytics_id: "UA-110457476-1"
-...
diff --git a/dev-tools/ansible/inventories/scigap/stagingnew/pga_config/seagrid/vault.yml b/dev-tools/ansible/inventories/scigap/stagingnew/pga_config/seagrid/vault.yml
deleted file mode 100644
index af2673b..0000000
--- a/dev-tools/ansible/inventories/scigap/stagingnew/pga_config/seagrid/vault.yml
+++ /dev/null
@@ -1,18 +0,0 @@
-$ANSIBLE_VAULT;1.1;AES256
-63383837396262336563656433376638646633666363643538636335626662313365656562356661
-3934393534323666643862646566323533666530616632350a656438373832313334386630643131
-30333932393737643331636466313839353734343264363531383065323464313638653732643666
-6665386237633864640a366665316633396634383261323535623465363938386337663261323232
-64373062353532313034313361313632646639643630616566396634393637323231376463306631
-34343365376665353363303233313264353962636331346164306465316332343731363135363234
-31343331333861363239343532303561333861633965373231316465643934633438313938396162
-33356239623839323365663236626531653864353538623132383835396230323636623832636432
-64646165356234333234613039613937373737633165616438623930646263313762316335636435
-38663230336562343161633035386634373837653866363662316631336237383231326238336438
-30363432383363343465646537383864323063303735343534373734343132633361656533383835
-66623436373463326564316163373938366538323639363535313835366136393739376634626462
-36646632363530346537336463653134653030383938616235326461316432383966323064663937
-35643534343930313463653939386138363139313834616638326338663661636666356164396164
-38643736323064363539383566303731363133653362393762373138303832363935363964393336
-31646136633032353832323338376665353837343039353061383435323264356339633162353238
-3364
diff --git a/dev-tools/ansible/inventories/scigap/stagingnew/pga_config/searchingSRA/vars.yml b/dev-tools/ansible/inventories/scigap/stagingnew/pga_config/searchingSRA/vars.yml
deleted file mode 100644
index d89a5a9..0000000
--- a/dev-tools/ansible/inventories/scigap/stagingnew/pga_config/searchingSRA/vars.yml
+++ /dev/null
@@ -1,68 +0,0 @@
-#
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
----
-pga_repo: "https://github.com/apache/airavata-php-gateway.git"
-user: "pga"
-group: "pga"
-doc_root_dir: "/var/www/portals/{{ gateway_id }}"
-vhost_servername: "www.searchsra.org"
-vhost_serveralias: "sciencegateway.searchsra.org"
-vhost_ssl: true
-# TODO: have Ansible manage these files as well
-ssl_certificate_file: "/etc/letsencrypt/live/www.searchsra.org/cert.pem"
-ssl_certificate_chain_file: "/etc/letsencrypt/live/www.searchsra.org/fullchain.pem"
-ssl_certificate_key_file: "/etc/letsencrypt/live/www.searchsra.org/privkey.pem"
-
-php_upload_max_filesize: "10M"
-php_post_max_size: "60M"
-
-## Keycloak related variables
-tenant_domain: "{{ gateway_id }}"
-admin_username: "admin"
-admin_password: "{{ vault_admin_password }}"
-oauth_client_key: "{{ vault_oauth_client_key }}"
-oauth_client_secret: "{{ vault_oauth_client_secret }}"
-oidc_discovery_url: "https://iam.scigap.org/auth/realms/{{ tenant_domain }}/.well-known/openid-configuration"
-
-auth_options:
-  - name: "Searching SRA Gateway"
-    oauth_grant_type: "password"
-# - name: "CILogon"
-#    oauth_grant_type: "authorization_code"
-#   oauth_authorize_url_extra_params: "kc_idp_hint=cilogon"
-#   logo: "/assets/cilogon-logo-24x24-b.png"
-oauth_callback_url: "http://{{ vhost_servername }}/callback-url"
-
-gateway_id: "searching-sra"
-# relative to document root dir
-experiment_data_dir: "{{ user_data_dir }}/searching-sra"
-gateway_data_store_resource_id: "gf4.ucs.indiana.edu_61552681-96f0-462a-a36c-a62a010bffc6"
-gateway_data_store_ssh_public_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCx981DispO1AnkOAwq1oJ3iaYUW6KT4jn4OPSrvIb1fJyjkNdBK8KQUTviBMgqLH9+FlIx/FYjN7sVLelGUmfOgguIWB4Ea2epAyvGFfrVeF83w5A4uILfrd5AJQuk0sZkNjnnGmmpx6z60IThaof2f14uD7JPcn5Kf0xnfmhJGIo2DYJRp8DYJ4Upd1ENu4p3CqylZGBFTx0ROe3hCNj28BxCY+kTgKTQJQHdwuHK9WxovQHdv2ZrN9GeSyIPUX8W1PpYKqM2i8xGaagPUamHON9TonHyuAdd84CagonwuaG54+jbFbB9uW/zhhnP5vNRxK8aSNIhszOucE2g8xzL"
-
-## Portal related variables
-super_admin_portal: "false"
-admin_emails: "['sgrc-iu-group@iu.edu','rynge@isi.edu','raedwards@gmail.com']"
-portal_email_username: "pga.airavata@gmail.com"
-portal_email_password: "{{ vault_portal_email_password }}"
-portal_theme: "searchingsra-gateway-theme"
-#portal_theme_repo: "https://github.com/SciGaP/gsu-gateway-theme"
-portal_title: "Searching SRA"
-...
diff --git a/dev-tools/ansible/inventories/scigap/stagingnew/pga_config/searchingSRA/vault.yml b/dev-tools/ansible/inventories/scigap/stagingnew/pga_config/searchingSRA/vault.yml
deleted file mode 100644
index a041954..0000000
--- a/dev-tools/ansible/inventories/scigap/stagingnew/pga_config/searchingSRA/vault.yml
+++ /dev/null
@@ -1,18 +0,0 @@
-$ANSIBLE_VAULT;1.1;AES256
-35386464643163383630363263303730366266303063646464656136623933663036666338666237
-3934356532313039306239616539336263373837363632640a626130653031366131633739663065
-36383531373166326431643362633964356530616466303339376365316131616466303233323464
-3130326562613461350a653436633933346335613337353564656364383463653237303036393039
-62386339303633373366313330323036626162393131383033313334373337313234376161653237
-37363932646464323461343861393762303332353462353761373533303861313830366238316438
-65613433323764313364373235646164653231643933323533366464333766633964393739366361
-38656533643139656639366162316530613535623635363937376466363833373431373438613033
-35616337386162393863613439353638306634333339616636386632646338306536643364353037
-35343464343363613862653534616537626339366461656163633963353430633064316131623562
-31333531303261376265346365383930306538373734643132646634373836346136366335303239
-37666134336536323036363031333831316163653033643731343332633936643632626165666464
-33356133623539363831656338636139336533306536313031636139613432383666353461646464
-63663130306438663233303466663634383061383237653231326338373733626531663032373831
-38616139636664373538653063336236336630366530353663363130393962393035633333396263
-62343332333362366466303165373333333861626231333163656638396430623963316635353161
-3335
diff --git a/dev-tools/ansible/inventories/scigap/stagingnew/pga_config/simvascular/files/pga_config.php.j2 b/dev-tools/ansible/inventories/scigap/stagingnew/pga_config/simvascular/files/pga_config.php.j2
deleted file mode 100644
index f44fcd2..0000000
--- a/dev-tools/ansible/inventories/scigap/stagingnew/pga_config/simvascular/files/pga_config.php.j2
+++ /dev/null
@@ -1,295 +0,0 @@
-<?php
-return array(
-    /**
-     * *****************************************************************
-     *  WSO2 Identity Server Related Configurations
-     * *****************************************************************
-     */
-
-    'wsis' => [
-
-        /**
-         * Admin Role Name
-         */
-        'admin-role-name' => '{{ admin_role_name }}',
-
-        /**
-         * Read only Admin Role Name
-         */
-        'read-only-admin-role-name' => '{{ admin_readonly_role_name }}',
-
-        /**
-         * Gateway user role
-         */
-        'user-role-name' => '{{ user_role_name }}',
-
-        /**
-         * Initial user role. This is the initial user role assigned to a new
-         * user. Set this to one of the three roles above to automatically
-         * grant new users that role, or set to some other role ('user-pending')
-         * to require admin approval before users have access.
-         */
-        'initial-role-name' => '{{ initial_role_name }}',
-
-        /**
-         * Tenant Domain
-         */
-        'tenant-domain' => '{{ tenant_domain }}',
-
-        /**
-         * Tenant admin's username
-         */
-        'admin-username' => '{{ admin_username }}',
-
-        /**
-         * Tenant admin's password
-         */
-        'admin-password' => '{{ admin_password }}',
-
-        /**
-         * OAuth client key
-         */
-        'oauth-client-key' => '{{ oauth_client_key }}',
-
-        /**
-         * OAuth client secret
-         */
-        'oauth-client-secret' => '{{ oauth_client_secret }}',
-
-        /**
-         * Authentication options
-         */
-        'auth-options' => [
-            {% for auth_option in auth_options %}
-            [
-                'oauth-grant-type' => '{{ auth_option["oauth_grant_type"] }}',
-                'name' => '{{ auth_option["name"] }}',
-                {% if "oauth_authorize_url_extra_params" in auth_option %}
-                'oauth-authorize-url-extra-params' => '{{ auth_option["oauth_authorize_url_extra_params"] }}',
-                {% endif %}
-                {% if "logo" in auth_option %}
-                'logo' => '{{ auth_option["logo"] }}',
-                {% endif %}
-            ],
-            {% endfor %}
-        ],
-
-        /**
-         * OAuth call back url (only if the grant type is authorization_code)
-         */
-        'oauth-callback-url' => '{{ oauth_callback_url }}',
-
-        /**
-         * For OIDC servers that support the discovery protocol.
-         */
-        'openid-connect-discovery-url' => '{{ oidc_discovery_url }}',
-
-        /**
-         * Identity server url
-         */
-        'service-url' => '{{ oauth_service_url }}',
-
-        /**
-         * Enable HTTPS server verification
-         */
-        'verify-peer' => {{ auth_verify_peer }},
-
-        /**
-         * Path to the server certificate file
-         */
-        'cafile-path' => app_path() . '/resources/security/incommon_rsa_server_ca.pem',
-    ],
-
-
-    /**
-     * *****************************************************************
-     *  Airavata Client Configurations
-     * *****************************************************************
-     */
-    'airavata' => [
-
-        /**
-         * Airavata API server location. Use tls:// as the protocol to
-         * connect TLS enabled Airavata
-         */
-        'airavata-server' => '{{ airavata_server }}',
-
-        /**
-         * Airavata API server port
-         */
-        'airavata-port' => '{{ airavata_port }}',
-
-        /**
-         * Airavata Profile Service server location. Use tls:// as the protocol to
-         * connect over TLS
-         */
-        'airavata-profile-service-server' => '{{ airavata_profile_service_server }}',
-
-        /**
-         * Airavata Profile Service port
-         */
-        'airavata-profile-service-port' => '{{ airavata_profile_service_port }}',
-
-        /**
-         * Airavata API server thrift communication timeout
-         */
-        'airavata-timeout' => '1000000',
-
-        /**
-         * PGA Gateway ID
-         */
-        'gateway-id' => '{{ gateway_id }}',
-
-        /**
-         * Maximum size of a file which is allowed to upload to the server
-         */
-        'server-allowed-file-size' => 64,
-
-        /**
-         * absolute path of the data dir
-         */
-        'experiment-data-absolute-path' => '{{ experiment_data_dir }}',
-
-        /**
-         * Advanced experiments options
-         */
-        'advanced-experiment-options' => '',
-
-        /**
-         * Default queue name
-         */
-        'queue-name' => 'long',
-
-        /**
-         * Default node count
-         */
-        'node-count' => '1',
-
-        /**
-         * Default total core count
-         */
-        'total-cpu-count' => '16',
-
-        /**
-         * Default wall time limit
-         */
-        'wall-time-limit' => '30',
-
-        /**
-         * Max node count
-         */
-        'max-node-count' => '4',
-
-        /**
-         * Max total core count
-         */
-        'max-total-cpu-count' => '96',
-
-        /**
-         * Max wall time limit
-         */
-        'max-wall-time-limit' => '600',
-
-        /**
-         * Enable app-catalog cache
-         */
-        'enable-app-catalog-cache' => true,
-
-        /**
-         * Life time of app catalog data cache in minutes
-         */
-        'app-catalog-cache-duration' => 5,
-
-         /**
-         * Gateway data store resource id
-         */
-         'gateway-data-store-resource-id' => '{{ gateway_data_store_resource_id }}',
-
-         /**
-          * Data Sharing enabled
-          */
-          'data-sharing-enabled' => {{ data_sharing_enabled }}
-    ],
-
-    /**
-     * *****************************************************************
-     *  Portal Related Configurations
-     * *****************************************************************
-     */
-    'portal' => [
-        /**
-         * Whether this portal is the SciGaP admin portal
-         */
-        'super-admin-portal' => {{ super_admin_portal }},
-
-        /**
-         * Set the name of theme in use here
-         */
-        'theme' => '{{ portal_theme }}',
-
-        /**
-         * Portal title
-         */
-        'portal-title' => '{{ portal_title }}',
-
-        /**
-         * Email address of the portal admin. Portal admin well get email notifications for events
-         * such as new user creation
-         */
-        'admin-emails' => {{ admin_emails }},
-
-        /**
-         * Email account that the portal should login to send emails
-         */
-        'portal-email-username' => '{{ portal_email_username }}',
-
-        /**
-         * Password for the portal's email account
-         */
-        'portal-email-password' => '{{ portal_email_password }}',
-
-        /**
-         * SMTP server on which the portal should connect
-         */
-        'portal-smtp-server-host' => 'smtp.gmail.com',
-
-        /**
-         * SMTP server port on which the portal should connect
-         */
-        'portal-smtp-server-port' => '587',
-
-        /**
-         * Set JIRA Issue Collector scripts here.
-         */
-        'jira-help' =>
-        [
-            /**
-             * Report Issue Script issued for your app by Atlassian JIRA
-             */
-            'report-issue-script' => '',
-            /**
-             * Collector id at the end of the above script
-             */
-            'report-issue-collector-id' => '',
-            /**
-             * Create Report Script issued for your app by Atlassian JIRA
-             */
-            'request-feature-script' => '',
-            /**
-             * Collector id at the end of the above script
-             */
-            'request-feature-collector-id' => ''
-        ],
-
-        /**
-         * Set Google Analytics Id here. ID format that generates from
-         * creating tracker object should be
-         *
-         * UA-XXXXX-Y
-         *
-         * for it to be working correctly. Currently it is only set for
-         * sending pageviews.
-         */
-        'google-analytics-id' => '{{ pga_google_analytics_id }}'
-    ]
-);
diff --git a/dev-tools/ansible/inventories/scigap/stagingnew/pga_config/simvascular/vars.yml b/dev-tools/ansible/inventories/scigap/stagingnew/pga_config/simvascular/vars.yml
deleted file mode 100644
index 307dc1a..0000000
--- a/dev-tools/ansible/inventories/scigap/stagingnew/pga_config/simvascular/vars.yml
+++ /dev/null
@@ -1,71 +0,0 @@
-#
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
----
-pga_repo: "https://github.com/apache/airavata-php-gateway.git"
-user: "pga"
-group: "pga"
-doc_root_dir: "/var/www/portals/simvascular"
-vhost_servername: "gateway.simvascular.org"
-vhost_ssl: True
-# TODO: have Ansible manage these files as well
-ssl_certificate_file: "/etc/letsencrypt/live/gateway.simvascular.org/cert.pem"
-ssl_certificate_chain_file: "/etc/letsencrypt/live/gateway.simvascular.org/fullchain.pem"
-ssl_certificate_key_file: "/etc/letsencrypt/live/gateway.simvascular.org/privkey.pem"
-
-php_upload_max_filesize: "300M"
-php_post_max_size: "2000M"
-
-# Custom pga_config file (gateway level maximum values)
-pga_config_template: "{{ inventory_dir }}/pga_config/simvascular/files/pga_config.php.j2"
-
-## Keycloak related variables
-tenant_domain: "{{ gateway_id }}"
-admin_username: "admin"
-admin_password: "{{ vault_admin_password }}"
-oauth_client_key: "{{ vault_oauth_client_key }}"
-oauth_client_secret: "{{ vault_oauth_client_secret }}"
-oidc_discovery_url: "https://iam.scigap.org/auth/realms/{{ tenant_domain }}/.well-known/openid-configuration"
-
-auth_options:
-  - name: "SimVascular"
-    oauth_grant_type: "password"
-  - name: "CILogon"
-    oauth_grant_type: "authorization_code"
-    oauth_authorize_url_extra_params: "kc_idp_hint=cilogon"
-    logo: "/assets/cilogon-logo-24x24-b.png"
-oauth_callback_url: "https://{{ vhost_servername }}/callback-url"
-
-gateway_id: "simvascular"
-# relative to document root dir
-experiment_data_dir: "{{ user_data_dir }}/simvascular"
-gateway_data_store_resource_id: "gf4.ucs.indiana.edu_61552681-96f0-462a-a36c-a62a010bffc6"
-gateway_data_store_ssh_public_key: ""
-
-## Portal related variables
-super_admin_portal: "false"
-admin_emails: "['sgrc-iu-group@iu.edu','amarsden@stanford.edu','nwilson@osmsc.com']"
-portal_email_username: "pga.airavata@gmail.com"
-portal_email_password: "{{ vault_portal_email_password }}"
-portal_theme: "simvascular-gateway-theme"
-portal_theme_repo: "https://github.com/SciGaP/simvascular-gateway-theme.git"
-portal_title: "SimVascular Gateway Portal"
-pga_google_analytics_id: "UA-111528347-7"
-...
diff --git a/dev-tools/ansible/inventories/scigap/stagingnew/pga_config/simvascular/vault.yml b/dev-tools/ansible/inventories/scigap/stagingnew/pga_config/simvascular/vault.yml
deleted file mode 100644
index eb18126..0000000
--- a/dev-tools/ansible/inventories/scigap/stagingnew/pga_config/simvascular/vault.yml
+++ /dev/null
@@ -1,18 +0,0 @@
-$ANSIBLE_VAULT;1.1;AES256
-61336435356436373565653262303165343962396239346663396531646162393537623561613337
-3961663030353736303235613137343833656130366437620a636461373933356531623633383334
-30316432616664346234613836336631636431306261303935363436333761663366643266613932
-3938366366343335380a393362316565633632656534376137346235646563373563636234373335
-39333739383431653032343231633863313263303830663335346538353334613430303134633630
-38646166343733353361326536393666393733646265333863363937353562393935633930343930
-38323535343862656430373966346663333064386263646137366666633866363165666334303461
-38623230366438666662303161313632323430633166306564386336613337663063393264313339
-65633464333561626461333365623633343062316663373234616461353136343033306338393263
-30666438306235373233616561613761393936646262666633313631316563333630663039643831
-31303839633232386638646335353031373537323466356466353334373739336435306438333761
-34643232316333343036326262373866663436313230643730363130636433376135353939656235
-38326262633565356334353464353138353764623131356233323264303232653534303032313430
-66323832343638623639373431333263653366623032333963653463313265316636663935376232
-62323331373530636366353139393533326463636339306535383837616337336538353036346239
-39363433393766376136383937613236306634653862346638393531306537653737346361356235
-6432
diff --git a/dev-tools/ansible/inventories/scigap/stagingnew/pga_config/southdakota/vars.yml b/dev-tools/ansible/inventories/scigap/stagingnew/pga_config/southdakota/vars.yml
deleted file mode 100644
index 7b1b127..0000000
--- a/dev-tools/ansible/inventories/scigap/stagingnew/pga_config/southdakota/vars.yml
+++ /dev/null
@@ -1,65 +0,0 @@
-#
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
----
-pga_repo: "https://github.com/apache/airavata-php-gateway.git"
-user: "pga"
-group: "pga"
-doc_root_dir: "/var/www/portals/southdakota"
-vhost_servername: "sciencegateway.usd.edu"
-vhost_ssl: True
-# TODO: have Ansible manage these files as well
-ssl_certificate_file: "/etc/pki/tls/certs/sciencegateway_usd_edu_cert.cer"
-ssl_certificate_chain_file: "/etc/pki/tls/certs/sciencegateway_usd_edu_interm.cer"
-ssl_certificate_key_file: "/etc/pki/tls/private/southdakota-sg.key"
-
-## Keycloak related variables
-tenant_domain: "{{ gateway_id }}"
-admin_username: "usdadmin"
-admin_password: "{{ vault_admin_password }}"
-oauth_client_key: "{{ vault_oauth_client_key }}"
-oauth_client_secret: "{{ vault_oauth_client_secret }}"
-oidc_discovery_url: "https://iam.scigap.org/auth/realms/{{ tenant_domain }}/.well-known/openid-configuration"
-
-auth_options:
-  - name: "Created Gateway Account (Users without University Account)"
-    oauth_grant_type: "password"
-  - name: "University Account"
-    oauth_grant_type: "authorization_code"
-    oauth_authorize_url_extra_params: "kc_idp_hint=cilogon"
-    logo: "/assets/cilogon-logo-24x24-b.png"
-oauth_callback_url: "https://{{ vhost_servername }}/callback-url"
-
-gateway_id: "southdakota"
-# relative to document root dir
-experiment_data_dir: "{{ user_data_dir }}/southdakota"
-gateway_data_store_resource_id: "gf4.ucs.indiana.edu_61552681-96f0-462a-a36c-a62a010bffc6"
-gateway_data_store_ssh_public_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCIUqpKWHwawFHnbWvs6pie+fDA9NlqMZNvzil7e8FQz7543+FOzdTl/octACjGnSTwHewpyTe9sAUVcnq6VJ5XYtApR68zMasEzyCZUMWhMqEuxopRZcUGDJVcq5hD4RZcer3aMPWSVmXVCNJeT4EsB52Zp2DfDVgfaOOfY8Ga4mcR2IdOyizV8HWXTH6vWFK+dD1GoPY0ECikwlsF1QA0vzqAcb1NYOTc70hZ9Pb0/78XF790joZ80hRsHGIc7IfncoLgRUkKSkMaoXbfy/tbqf76V0ZxaQOgayaLGF19oBlREO6ZQ3rDCOWgVJC32dCwAsaL9qWd0IZrprUEUQOd"
-
-## Portal related variables
-super_admin_portal: "false"
-admin_emails: "['Doug.Jennewein@usd.edu','sgrc-iu-group@iu.edu','Joseph.Madison@coyotes.usd.edu']"
-portal_email_username: "pga.airavata@gmail.com"
-portal_email_password: "{{ vault_portal_email_password }}"
-portal_theme: "usd-cybergateway-theme"
-portal_theme_repo: "https://github.com/SciGaP/usd-cybergateway-theme.git"
-portal_title: "South Dakota Science Gateway"
-pga_google_analytics_id: "UA-117517811-1"
-...
diff --git a/dev-tools/ansible/inventories/scigap/stagingnew/pga_config/southdakota/vault.yml b/dev-tools/ansible/inventories/scigap/stagingnew/pga_config/southdakota/vault.yml
deleted file mode 100644
index 3c6f803..0000000
--- a/dev-tools/ansible/inventories/scigap/stagingnew/pga_config/southdakota/vault.yml
+++ /dev/null
@@ -1,17 +0,0 @@
-$ANSIBLE_VAULT;1.1;AES256
-61376666373530656661656361663664346630386164653066643430336231336432336163653161
-3537343037343937393132333663616635616461323539340a643430666165326261306532346438
-33383233343532306532663266613132326337646535643465303231666665646638353332303539
-3731663562303366300a646633666635313038626532303735613339303330626635346166363532
-30363530323865383833353635306565643761663434653135323966646431653438383239366364
-65636263363635643236313030373331656438653532323431303334326334376133303434303133
-37383439313636363631333234646462326337313134633366383562353361346635376261363464
-31626338346133306537666138633731303365316264633865643062383862323061313661313938
-61636162376165646633386333626331656566376632356165643332646263396236323132316635
-37393933343931353661626262313036636531326533343332646166643663313863363563646637
-34643631643861653538643934323166376564383164653730323238386230663861383338326133
-65346630383832366236616162376537373464356562613835656363613736643333306365396137
-35373139363232303961633339303732653061356637643137666661623661313166646264316666
-33323033313239343464386337646438356165386166633865313766626264343233306536353930
-33363436386163323665663766306463633031393662383831353564633962616336656533303332
-33333232393262663631
diff --git a/dev-tools/ansible/inventories/scigap/stagingnew/pga_config/southernillinois/vars.yml b/dev-tools/ansible/inventories/scigap/stagingnew/pga_config/southernillinois/vars.yml
deleted file mode 100644
index 2d06199..0000000
--- a/dev-tools/ansible/inventories/scigap/stagingnew/pga_config/southernillinois/vars.yml
+++ /dev/null
@@ -1,65 +0,0 @@
-#
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
----
-pga_repo: "https://github.com/apache/airavata-php-gateway.git"
-user: "pga"
-group: "pga"
-doc_root_dir: "/var/www/portals/southernillinois"
-vhost_servername: "sciencegateway.siu.edu"
-vhost_ssl: True
-# TODO: have Ansible manage these files as well
-ssl_certificate_file: "/etc/letsencrypt/live/sciencegateway.siu.edu/cert.pem"
-ssl_certificate_chain_file: "/etc/letsencrypt/live/sciencegateway.siu.edu/fullchain.pem"
-ssl_certificate_key_file: "/etc/letsencrypt/live/sciencegateway.siu.edu/privkey.pem"
-
-## Keycloak related variables
-tenant_domain: "{{ gateway_id }}"
-admin_username: "admin"
-admin_password: "{{ vault_admin_password }}"
-oauth_client_key: "{{ vault_oauth_client_key }}"
-oauth_client_secret: "{{ vault_oauth_client_secret }}"
-oidc_discovery_url: "https://iam.scigap.org/auth/realms/{{ tenant_domain }}/.well-known/openid-configuration"
-
-auth_options:
-  - name: "Southern Illinois Science Gateway"
-    oauth_grant_type: "password"
-  - name: "CILogon"
-    oauth_grant_type: "authorization_code"
-    oauth_authorize_url_extra_params: "kc_idp_hint=cilogon"
-    logo: "/assets/cilogon-logo-24x24-b.png"
-oauth_callback_url: "https://{{ vhost_servername }}/callback-url"
-
-gateway_id: "southill"
-# relative to document root dir
-experiment_data_dir: "{{ user_data_dir }}/southernillinois"
-gateway_data_store_resource_id: "gf4.ucs.indiana.edu_61552681-96f0-462a-a36c-a62a010bffc6"
-gateway_data_store_ssh_public_key: ""
-
-## Portal related variables
-super_admin_portal: "false"
-admin_emails: "['sgrc-iu-group@iu.edu','saisusheel.sunkara@siu.edu']"
-portal_email_username: "pga.airavata@gmail.com"
-portal_email_password: "{{ vault_portal_email_password }}"
-portal_theme: "siu-gateway-theme"
-portal_theme_repo: "https://github.com/SciGaP/siu-gateway-theme.git"
-portal_title: "Southern Illinois Science Gateway"
-pga_google_analytics_id: "UA-111528347-6"
-...
diff --git a/dev-tools/ansible/inventories/scigap/stagingnew/pga_config/southernillinois/vault.yml b/dev-tools/ansible/inventories/scigap/stagingnew/pga_config/southernillinois/vault.yml
deleted file mode 100644
index 27031a6..0000000
--- a/dev-tools/ansible/inventories/scigap/stagingnew/pga_config/southernillinois/vault.yml
+++ /dev/null
@@ -1,18 +0,0 @@
-$ANSIBLE_VAULT;1.1;AES256
-61643637383338646635376637313364643634373565346166643564346530343134626661636662
-6635663335636633343039356165613463393264313634610a366430376161326236666662306234
-36663961653836613235613938383834386464656635303666336238343739326462613364303066
-3339316164333634350a376638326165366362303336366131653663323530373561313830303262
-36363032303666303031323838663430646565656362333363383566643463633039353034326330
-66366437346132623537363664353932353339373033386535313366306337626666633739643133
-36666461643864363134613262613338633866393238653862623830666534356364373030666536
-65343231316337393361643862336234623464363031343635373063386237613963666532626235
-31623237363362386163363834646530306263653032383939303333653462396439633038303165
-63323539616166356562336566356133393735366164363064646535306635366163333430666564
-37383365616166343932343334343230343461393237333061346338366531313964306430336563
-66653538653261316331346263323165656536383762393736646434653134316339343439363034
-38643838316438336236333563306435626364383237386364353365316365396664613437323063
-65316331636434353662643235326665326161663937306139383737623635663738313763663733
-64643835376232333635386531313566653238623863316262323966616166363865313234303930
-32656361666535333131393532626364366231626130336539636563336230666366306361326337
-6132
diff --git a/dev-tools/ansible/inventories/scigap/stagingnew/pga_config/testdrive/vars.yml b/dev-tools/ansible/inventories/scigap/stagingnew/pga_config/testdrive/vars.yml
deleted file mode 100644
index fc77076..0000000
--- a/dev-tools/ansible/inventories/scigap/stagingnew/pga_config/testdrive/vars.yml
+++ /dev/null
@@ -1,66 +0,0 @@
-#
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
----
-pga_repo: "https://github.com/apache/airavata-php-gateway.git"
-user: "pga"
-group: "pga"
-doc_root_dir: "/var/www/portals/testdrive"
-vhost_servername: "testdrive.airavata.org"
-vhost_serveralias: "www.testdrive.airavata.org"
-#vhost_servername: "beta.testdrive.airavata.org"
-vhost_ssl: True
-ssl_certificate_file: "/etc/letsencrypt/live/testdrive.airavata.org/cert.pem"
-ssl_certificate_chain_file: "/etc/letsencrypt/live/testdrive.airavata.org/fullchain.pem"
-ssl_certificate_key_file: "/etc/letsencrypt/live/testdrive.airavata.org/privkey.pem"
-
-## Keycloak related variables
-tenant_domain: "{{ gateway_id }}"
-admin_username: "tdaadmin"
-admin_password: "{{ vault_admin_password }}"
-oauth_client_key: "{{ vault_oauth_client_key }}"
-oauth_client_secret: "{{ vault_oauth_client_secret }}"
-oidc_discovery_url: "https://iam.scigap.org/auth/realms/{{ tenant_domain }}/.well-known/openid-configuration"
-
-auth_options:
-  - name: "Test Drive"
-    oauth_grant_type: "password"
-  - name: "CILogon"
-    oauth_grant_type: "authorization_code"
-    oauth_authorize_url_extra_params: "kc_idp_hint=cilogon"
-    logo: "/assets/cilogon-logo-24x24-b.png"
-oauth_callback_url: "https://{{ vhost_servername }}/callback-url"
-
-gateway_id: "default"
-# relative to document root dir
-experiment_data_dir: "{{ user_data_dir }}/testdrive"
-gateway_data_store_resource_id: "gf4.ucs.indiana.edu_61552681-96f0-462a-a36c-a62a010bffc6"
-gateway_data_store_ssh_public_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCUF51b2cYYqqadLHL9M/oPY0ZHZlWbdOdaIgjpzIzMnO7M9hKrHVY2pqyLPvqCLzaunxITPWsTqw0E8hwub4ttGLAx/O4kIf+BgyZK7iuwXWhI7u85/o58IfrD4B+jVCYKRNayuLR+lJWsiOeS6HSlunpTKTEhFGeOHn2UzdbLfgWYQ3VUFDtKN1oDPDT78ml5c2RCibJ21jltpevVfEtCUctERpTfniWSuQZggP1qiLNa1+PfiJ3mGsEzJFDntQvQetdinaAbEaT7+sctS8nBNjapkmYMf6tBl3S0bLttYPH51f8lUQAFaAzrestO1JpJNnIeY01/S3MWIlAWASnn"
-
-## Portal related variables
-super_admin_portal: "false"
-admin_emails: "['sgrc-iu-group@iu.edu']"
-portal_email_username: "pga.airavata@gmail.com"
-portal_email_password: "{{ vault_portal_email_password }}"
-#portal_theme: "base"
-#portal_theme_repo: ""
-portal_title: "Airavata Test Drive"
-pga_google_analytics_id: "UA-111528347-2"
-...
diff --git a/dev-tools/ansible/inventories/scigap/stagingnew/pga_config/testdrive/vault.yml b/dev-tools/ansible/inventories/scigap/stagingnew/pga_config/testdrive/vault.yml
deleted file mode 100644
index 95c6b7b..0000000
--- a/dev-tools/ansible/inventories/scigap/stagingnew/pga_config/testdrive/vault.yml
+++ /dev/null
@@ -1,18 +0,0 @@
-$ANSIBLE_VAULT;1.1;AES256
-62316432336565373739373638656637383161323536666436333537613536316266663164316635
-3132356235643331643331633662356338396533653764390a313730663662626436663538313464
-66373335636162303330353861373638396661663132643261363939386566613439333762613661
-6238343362343065340a396661346465366335366431613565346339376133636138613338353334
-31643162383939353364363465353630393134656530646535376230303233333031636639333033
-63373166363130653038633432333335623131373637363635393662313235313732323036303965
-32306331646635656661313330646232363931623864393036336634363632303634653639326238
-65663739663439653333333532303862333932343663303465623062383432333031353730653366
-66373135383561386533353331643238666563633337353565326139306139353661326233663433
-39613466393030356563396331353639633835663636666137623561623237346666643230663832
-38663965623638343161386238386133373531373238623263613531376137393531613031643333
-37376462316562313632616338353163373839616237323734356638316535333638383164373065
-37343234393532353964313039363038663937323730623232366230343034656366333933366162
-33663637343837643161616162633964623136376161633661633533616533396139623033666533
-31363064363861623338323831363864303464393666363432383935356461656133653165333531
-64313835316362363633633865623265613431643133333230376333323030626334623235343432
-3163
diff --git a/dev-tools/ansible/inventories/scigap/stagingnew/pga_config/uab/vars.yml b/dev-tools/ansible/inventories/scigap/stagingnew/pga_config/uab/vars.yml
deleted file mode 100644
index 8c041c8..0000000
--- a/dev-tools/ansible/inventories/scigap/stagingnew/pga_config/uab/vars.yml
+++ /dev/null
@@ -1,64 +0,0 @@
-#
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
----
-pga_repo: "https://github.com/apache/airavata-php-gateway.git"
-user: "pga"
-group: "pga"
-doc_root_dir: "/var/www/portals/alabama-birmingham"
-vhost_servername: "torana.rc.uab.edu"
-vhost_ssl: true
-# TODO: have Ansible manage these files as well
-ssl_certificate_file: "/etc/letsencrypt/live/torana.rc.uab.edu/cert.pem"
-ssl_certificate_chain_file: "/etc/letsencrypt/live/torana.rc.uab.edu/fullchain.pem"
-ssl_certificate_key_file: "/etc/letsencrypt/live/torana.rc.uab.edu/privkey.pem"
-
-## Keycloak related variables
-tenant_domain: "{{ gateway_id }}"
-admin_username: "admin"
-admin_password: "{{ vault_admin_password }}"
-oauth_client_key: "{{ vault_oauth_client_key }}"
-oauth_client_secret: "{{ vault_oauth_client_secret }}"
-oidc_discovery_url: "https://iam.scigap.org/auth/realms/{{ tenant_domain }}/.well-known/openid-configuration"
-
-auth_options:
-  - name: "The University of Alabama at Birmingham Science Gateway"
-    oauth_grant_type: "password"
-  - name: "CILogon"
-    oauth_grant_type: "authorization_code"
-    oauth_authorize_url_extra_params: "kc_idp_hint=cilogon"
-    logo: "/assets/cilogon-logo-24x24-b.png"
-oauth_callback_url: "https://{{ vhost_servername }}/callback-url"
-
-gateway_id: "alabama-birmingham"
-# relative to document root dir
-experiment_data_dir: "{{ user_data_dir }}/alabama-birmingham"
-gateway_data_store_resource_id: "gf4.ucs.indiana.edu_61552681-96f0-462a-a36c-a62a010bffc6"
-gateway_data_store_ssh_public_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDA5artIAZPYC9GmFvb7HpvwbHpYoSXN0xJkHWoz8joWWBA3wW2De2Q72Rk5CYElpOLbrjJCsFK3YxiCQYYRl5R4VFadw0agGIxn0PssCR5sIUDpEe4ezQmEx3rA3RUEvA3uZ6SjzjuwqQtEKMvARP4mCwEC/vR0eLWe1/ZDLF71w7zVZAmt+K/Z/Dnas/NTE7yV9XadD2TctFWmBwMNQSEfSsDfW39cabwEghanoUMGTYT9f4EL6x4zOzdbcHl1aF5QlGHf91hQCwfxH6FSZYmu+HhcKshbOI/I0u+UDKV+CX/1SxUZNpwpJ3ESR4ke7jdgP+GTwwl4bBSTn738m9t"
-
-## Portal related variables
-super_admin_portal: "false"
-admin_emails: "['sgrc-iu-group@iu.edu','tanthony@uab.edu']"
-portal_email_username: "pga.airavata@gmail.com"
-portal_email_password: "{{ vault_portal_email_password }}"
-#portal_theme: "gsu-gateway-theme"
-#portal_theme_repo: "https://github.com/SciGaP/gsu-gateway-theme"
-portal_title: "University of Alabama at Birmingham Science Gateway"
-...
diff --git a/dev-tools/ansible/inventories/scigap/stagingnew/pga_config/uab/vault.yml b/dev-tools/ansible/inventories/scigap/stagingnew/pga_config/uab/vault.yml
deleted file mode 100644
index 9774028..0000000
--- a/dev-tools/ansible/inventories/scigap/stagingnew/pga_config/uab/vault.yml
+++ /dev/null
@@ -1,18 +0,0 @@
-$ANSIBLE_VAULT;1.1;AES256
-61613632623766383839336665333433343137356461613266656464333261366565653663386339
-3533613637626266663962646635326365313931386562360a356433353233323238666462366538
-61376332616662333733353961633165396437633533623364376161636661663535363839353236
-3434366337663666330a656531363033316264373335396663306264343138643839333766623339
-38626665613835666565393863633566396466653330373232363231613332306232396238386631
-37316433633339336437626636363762663938313938663737343564313430373736376665303461
-38666161656332306339613337373238626130626664636535383938623637373831333439616161
-63376234616135353834343064353238383161613731396162366532326665376636306462613331
-66346530613033383830353630333562303363353064633131343432306235343663313764363038
-37323762373766336466373239396235623130383165616462373831323735646165363764313439
-37623636383934383736393061353631316634303963333438616234636132356630326236623265
-63323635313432656534383034386334323734366430653437386333613037333031613264343238
-32373062356632633661653364623538383138353464373830353138396261626438623933316137
-33363933633535656636353738326432393461326632343039326264336534643031346236643930
-62386431306562656436376664626664626464326130316233313032376435396364663438353634
-66343832623935623631663965613739636135646539333332316566393030373434363463373932
-3963
diff --git a/dev-tools/ansible/inventories/scigap/stagingnew/pga_config/ultrascan/vars.yml b/dev-tools/ansible/inventories/scigap/stagingnew/pga_config/ultrascan/vars.yml
deleted file mode 100644
index dd1e55a..0000000
--- a/dev-tools/ansible/inventories/scigap/stagingnew/pga_config/ultrascan/vars.yml
+++ /dev/null
@@ -1,66 +0,0 @@
-#
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
----
-pga_repo: "https://github.com/apache/airavata-php-gateway.git"
-user: "pga"
-group: "pga"
-doc_root_dir: "/var/www/portals/{{ gateway_id }}"
-vhost_servername: "ultrascan.scigap.org"
-vhost_ssl: True
-# TODO: have Ansible manage these files as well
-ssl_certificate_file: "/etc/letsencrypt/live/ultrascan.scigap.org/cert.pem"
-ssl_certificate_chain_file: "/etc/letsencrypt/live/ultrascan.scigap.org/fullchain.pem"
-ssl_certificate_key_file: "/etc/letsencrypt/live/ultrascan.scigap.org/privkey.pem"
-
-## Keycloak related variables
-tenant_domain: "{{ gateway_id }}"
-admin_username: "admin"
-admin_password: "{{ vault_admin_password }}"
-oauth_client_key: "{{ vault_oauth_client_key }}"
-oauth_client_secret: "{{ vault_oauth_client_secret }}"
-oidc_discovery_url: "https://iam.scigap.org/auth/realms/{{ tenant_domain }}/.well-known/openid-configuration"
-
-auth_options:
-  - name: "Ultrascan Gateway"
-    oauth_grant_type: "password"
-  - name: "CILogon"
-    oauth_grant_type: "authorization_code"
-    oauth_authorize_url_extra_params: "kc_idp_hint=cilogon"
-    logo: "/assets/cilogon-logo-24x24-b.png"
-oauth_callback_url: "https://{{ vhost_servername }}/callback-url"
-
-gateway_id: "ultrascan"
-# relative to document root dir
-experiment_data_dir: "{{ user_data_dir }}/ultrascan"
-gateway_data_store_resource_id: "gf4.ucs.indiana.edu_61552681-96f0-462a-a36c-a62a010bffc6"
-gateway_data_store_ssh_public_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCloIIv+f8p/YbCyn0i1tOdwGW0mi/KdZCO8X0e7pPLhL7UZmrjKPCBWqlH92EKr6RnCENx5YCmmRm7DOqm1RuuER//2bxd5w+VmURAmuM1MdVpMocT6z9a51F9YEbfQfTLzES6fXyeRqq7aMljqYWovdM6uSFuIahvaTOwU0G/VrW0NBc411K0Kl1fWxpbPVy+ZCJJzCyP7JBV6sZMFFhT1/VQwsp1/0bBZwTPvaVwPcfibp65t99k4oxhGFVBhxBQ9KCki1uMr0sXJqB3udbBW26CFL9NHFttEuPjXRU+wQBkdsTfGzpbpjQZ7isCDDLWMMKiHXqwqU+6tH1biGUX"
-data_sharing_enabled: "false"
-
-## Portal related variables
-super_admin_portal: "false"
-admin_emails: "['sgrc-iu-group@iu.edu']"
-portal_email_username: "pga.airavata@gmail.com"
-portal_email_password: "{{ vault_portal_email_password }}"
-portal_theme: "base"
-portal_title: "Ultrascan SciGaP Dashboard"
-...
-
-
diff --git a/dev-tools/ansible/inventories/scigap/stagingnew/pga_config/ultrascan/vault.yml b/dev-tools/ansible/inventories/scigap/stagingnew/pga_config/ultrascan/vault.yml
deleted file mode 100644
index f26d6f7..0000000
--- a/dev-tools/ansible/inventories/scigap/stagingnew/pga_config/ultrascan/vault.yml
+++ /dev/null
@@ -1,18 +0,0 @@
-$ANSIBLE_VAULT;1.1;AES256
-62623564396339653035663030366136343331363639643533386336646138646665346162393138
-3766653338323031626433346664643861313134306663610a613161376332313230633834396263
-39373533666263643439323035353134326438306234613636373337653639373762386237663831
-6139646232313737310a393535333662396535613434633532363038373933643835346236323935
-37653162613031643439613238316632643033396236653233356165653038316630643337313135
-39336266333735643063623666613634316636396134376264626638626161666232656163363266
-61616539363035363162616338633830386432643737396532373534656135306636316130306432
-37663762336163303561346633323466633765633465633937616131363739353536636134626230
-34353465323964656366643833303039336164626630373334653563343766383564313138623034
-38373239383936356634663162373063646165656630383134396163366561626634633565643566
-39663861343936306363313035343463353962653236663263313335303732663233306662393230
-32623635396339623035383233343434333561373164623138326161303334643063373865356166
-30626531373035653036383061366632616239626462336565383031623466333862353434386363
-33666135366164343136666637636665353031393739626463646663373765363366366664663062
-34316630613761306466356137643730396161616432656437336565373231336636653233636535
-34623734616461653837303431653139383564303837623761393762383633653264323431613532
-3332
diff --git a/dev-tools/ansible/inventories/scigap/stagingnew/pga_config/wvsu/vars.yml b/dev-tools/ansible/inventories/scigap/stagingnew/pga_config/wvsu/vars.yml
deleted file mode 100644
index 584a1bc..0000000
--- a/dev-tools/ansible/inventories/scigap/stagingnew/pga_config/wvsu/vars.yml
+++ /dev/null
@@ -1,70 +0,0 @@
-#
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
----
-pga_repo: "https://github.com/apache/airavata-php-gateway.git"
-user: "pga"
-group: "pga"
-doc_root_dir: "/var/www/portals/{{ gateway_id }}"
-vhost_servername: "sciencegateway.wvstateu.edu"
-#vhost_serveralias: "www.seagrid.org"
-#vhost_servername: "beta.seagrid.org"
-vhost_ssl: True
-# TODO: have Ansible manage these files as well
-ssl_certificate_file: "/etc/letsencrypt/live/sciencegateway.wvstateu.edu/cert.pem"
-ssl_certificate_chain_file: "/etc/letsencrypt/live/sciencegateway.wvstateu.edu/fullchain.pem"
-ssl_certificate_key_file: "/etc/letsencrypt/live/sciencegateway.wvstateu.edu/privkey.pem"
-#ssl_certificate_file: "/etc/letsencrypt/live/beta.seagrid.org/cert.pem"
-#ssl_certificate_chain_file: "/etc/letsencrypt/live/beta.seagrid.org/fullchain.pem"
-#ssl_certificate_key_file: "/etc/letsencrypt/live/beta.seagrid.org/privkey.pem"
-
-
-## Keycloak related variables
-tenant_domain: "{{ gateway_id }}"
-admin_username: "admin"
-admin_password: "{{ vault_admin_password }}"
-oauth_client_key: "{{ vault_oauth_client_key }}"
-oauth_client_secret: "{{ vault_oauth_client_secret }}"
-oidc_discovery_url: "https://iam.scigap.org/auth/realms/{{ tenant_domain }}/.well-known/openid-configuration"
-
-auth_options:
-  - name: "WVirginia State University"
-    oauth_grant_type: "password"
- # - name: "CILogon"
-  #  oauth_grant_type: "authorization_code"
- #   oauth_authorize_url_extra_params: "kc_idp_hint=cilogon"
-  #  logo: "/assets/cilogon-logo-24x24-b.png"
-oauth_callback_url: "https://{{ vhost_servername }}/callback-url"
-
-gateway_id: "wvirginia-state-university"
-# relative to document root dir
-experiment_data_dir: "{{ user_data_dir }}/wvirginia-state-university"
-gateway_data_store_resource_id: "gf4.ucs.indiana.edu_61552681-96f0-462a-a36c-a62a010bffc6"
-gateway_data_store_ssh_public_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCHm/f06vFCah0lVLnykei1cwkKMGwaCdn//BjZtG/9OnV7fjDzjISBCuz+LEC/FJKv3BaByAQ0Tvq0GxIgBzR31r2Qpp7yKJyl1THpftrshPOD2M1FOJfebc9QAnVKdQQpIGtA5/viOnZfV0nnEXqiKjafsAdwnSP3097XSvD7UvQGwkhmG4oIbs66RTh19gUB3/4QZZBEbUDBaeHrxzwS/NXaQorCfrZt2mJCNeFLdhiqqg2JbT4g4X/Crps6es/o3fN6mRsFnRu9Y5Xhh/FFyT/u8IiW18FzHaH9hfOhyxeKRQCk0nJV+aREcmJ3wIk7VRA/bKGWcVDqZRHRvcPR"
-
-## Portal related variables
-super_admin_portal: "false"
-admin_emails: "['smalkaram@wvstateu.edu', 'sgrc-iu-group@iu.edu']"
-portal_email_username: "pga.airavata@gmail.com"
-portal_email_password: "{{ vault_portal_email_password }}"
-#portal_theme: "base"
-#portal_theme_repo: "https://github.com/SciGaP/seagrid-website-theme.git"
-portal_title: "WVirginia State University"
-...
diff --git a/dev-tools/ansible/inventories/scigap/stagingnew/pga_config/wvsu/vault.yml b/dev-tools/ansible/inventories/scigap/stagingnew/pga_config/wvsu/vault.yml
deleted file mode 100644
index b3604e1..0000000
--- a/dev-tools/ansible/inventories/scigap/stagingnew/pga_config/wvsu/vault.yml
+++ /dev/null
@@ -1,18 +0,0 @@
-$ANSIBLE_VAULT;1.1;AES256
-35323762653231363462626232343162626463396532613066333835393036346438663033383265
-3033343435373136646238666630336664326462636663380a333864396266376535633663646364
-61313864383035336533326235643962336261366436396633666138373762303034626665306539
-6362623765646339650a336639323831356365656637306465323738626339353838383836323039
-66613633303932623163653366393533376130613230663161343863376665643761613839663564
-35366261333562333561646634383436343133366263643432396336356537303937386262343439
-61333861306436326465386337646663653333326531333662366536396336643037653266376665
-31613564336439363235653064313539613263666562326432373436393537373061306530633839
-37316237343336633966663436663462393133643231636566633061383164336130333566333333
-32646336393531383139306462643563663438373564653765346433646264653739313435323132
-37646431313366363663373234376564346437613432386536306334613661653937303664636532
-32633136393630333635326663346636393939303765313861613364653136306664653735343331
-62366331653262326662636363633665323931346337323461373230663531613664313963383862
-39663530353831326665626333643762343561313338333438623863313638383631663836346163
-32336539616137366630336238636633653661666135396330666130356236643263333739633466
-63613735346464613130363164343466313336633164333238373237633132643031656632633632
-3034