From d5f4e53dbbb91e77c2390cdb75fb1dc8b1bb954f Mon Sep 17 00:00:00 2001 From: Francis Kayiwa Date: Fri, 20 Dec 2024 06:52:49 -0500 Subject: [PATCH] add a test VM using the staging name became a blocker --- group_vars/lib_sftp/common.yml | 6 ------ group_vars/lib_sftp/staging.yml | 2 +- group_vars/sftp/staging.yml | 2 +- inventory/all_projects/lib_sftp | 1 + playbooks/lib_sftp.yml | 1 - 5 files changed, 3 insertions(+), 9 deletions(-) delete mode 100644 group_vars/lib_sftp/common.yml diff --git a/group_vars/lib_sftp/common.yml b/group_vars/lib_sftp/common.yml deleted file mode 100644 index 9b5b54cfd8..0000000000 --- a/group_vars/lib_sftp/common.yml +++ /dev/null @@ -1,6 +0,0 @@ ---- -auth_rule_one: "{{ vault_auth_rule_one }}" -auth_rule_two: "{{ vault_auth_rule_two }}" -auth_rule_three: "{{ vault_auth_rule_three }}" -auth_rule_dev: "{{ vault_auth_rule_dev }}" -almasftp_user_password: "{{ vault_almasftp_salted_user_password }}" diff --git a/group_vars/lib_sftp/staging.yml b/group_vars/lib_sftp/staging.yml index 92fca92be5..67873e7b6a 100644 --- a/group_vars/lib_sftp/staging.yml +++ b/group_vars/lib_sftp/staging.yml @@ -9,6 +9,6 @@ almasftp_user_password: "{{ vault_almasftp_user_password }}" aspaceftp_user: "{{ vault_libaspacesftp_user_password }}" aspaceftp_user_password: "alsosimple" lib_sftp_domain_group: "domain users@pu.win.princeton.edu" -host_ad_name: sftp-staging1.princeton.edu +host_ad_name: lib-sftp-test1.princeton.edu deploy_user_local_keys: - { name: 'bibdata-worker-staging1', key: "{{ lookup('file', '../roles/lib_sftp/files/id_rsa.pub') }}" } diff --git a/group_vars/sftp/staging.yml b/group_vars/sftp/staging.yml index 1c820e9c61..f602d05626 100644 --- a/group_vars/sftp/staging.yml +++ b/group_vars/sftp/staging.yml @@ -5,6 +5,6 @@ sssd_uris: sssd_search_base: "{{ vault_sssd_search_base }}" sssd_bind_dn: "{{ vault_sssd_bind_dn }}" sssd_bind_dn_password: "{{ vault_sssd_dn_password }}" -host_ad_name: sftp-staging1.princeton.edu +host_ad_name: lib-sftp-test1.princeton.edu deploy_user_local_keys: - { name: 'bibdata-worker-staging1', key: "{{ lookup('file', '../roles/lib_sftp/files/id_rsa.pub') }}" } diff --git a/inventory/all_projects/lib_sftp b/inventory/all_projects/lib_sftp index 2b58aa042c..ddca759da3 100644 --- a/inventory/all_projects/lib_sftp +++ b/inventory/all_projects/lib_sftp @@ -1,5 +1,6 @@ [libsftp_staging] lib-sftp-staging1.princeton.edu +lib-sftp-test1.princeton.edu [libsftp_production] lib-sftp-prod1.princeton.edu diff --git a/playbooks/lib_sftp.yml b/playbooks/lib_sftp.yml index 50cb733120..df68330b5c 100644 --- a/playbooks/lib_sftp.yml +++ b/playbooks/lib_sftp.yml @@ -21,7 +21,6 @@ vars_files: - ../group_vars/lib_sftp/vault.yml - - ../group_vars/lib_sftp/common.yml - ../group_vars/lib_sftp/{{ runtime_env | default('staging') }}.yml roles: - role: ../roles/deploy_user