From 3920143fb05b6ec0e9f44202d4f749dedd5bac04 Mon Sep 17 00:00:00 2001 From: Bo-Chun Louis Chen Date: Wed, 13 Nov 2024 15:15:16 -0600 Subject: [PATCH 1/2] fix: rename proxy roles --- group_vars/all | 12 ++++++------ proxy.yaml | 4 ++-- roles/{ood_proxy => http_proxy}/files/rewrite_map.py | 0 .../files/rewritemap_config.py | 0 roles/{ood_proxy => http_proxy}/tasks/main.yml | 0 .../templates/front-end_conf.j2 | 0 roles/{sshpiper => ssh_proxy}/tasks/main.yml | 0 .../templates/sshpiperd.service.j2 | 0 .../templates/sshpiperd.yaml.j2 | 0 9 files changed, 8 insertions(+), 8 deletions(-) rename roles/{ood_proxy => http_proxy}/files/rewrite_map.py (100%) rename roles/{ood_proxy => http_proxy}/files/rewritemap_config.py (100%) rename roles/{ood_proxy => http_proxy}/tasks/main.yml (100%) rename roles/{ood_proxy => http_proxy}/templates/front-end_conf.j2 (100%) rename roles/{sshpiper => ssh_proxy}/tasks/main.yml (100%) rename roles/{sshpiper => ssh_proxy}/templates/sshpiperd.service.j2 (100%) rename roles/{sshpiper => ssh_proxy}/templates/sshpiperd.yaml.j2 (100%) diff --git a/group_vars/all b/group_vars/all index 0a8fbc1c..9b71b687 100644 --- a/group_vars/all +++ b/group_vars/all @@ -339,8 +339,8 @@ node_exporter_sha256: "sha256sums.txt" node_exporter_scriptdir: "{{ playbook_dir }}" -# sshpiper - enable_sshpiper: false +# ssh_proxy + enable_ssh_proxy: false go_download_url: "https://go.dev/dl/go1.22.4.linux-amd64.tar.gz" go_download_path: "/tmp/go1.22.4.linux-amd64.tar.gz" go_binary_path: "/usr/local" @@ -352,16 +352,16 @@ - {"name": "gpfs4", "authorized_keys":"/gpfs4/data/user/home/$DOWNSTREAM_USER/.ssh/authorized_keys", "host": "login001", "private_key":"/gpfs4/data/user/home/$DOWNSTREAM_USER/.ssh/id_ecdsa"} - {"name": "gpfs5", "authorized_keys":"/gpfs5/data/user/home/$DOWNSTREAM_USER/.ssh/authorized_keys", "host": "login002", "private_key":"/gpfs5/data/user/home/$DOWNSTREAM_USER/.ssh/id_ecdsa"} -# ood_proxy - enable_ood_proxy: false +# http_proxy + enable_http_proxy: false # cod_slurm frozen_file_list: - /cm/shared/apps/slurm/var/etc/slurm/cgroup.conf - - /cm/shared/apps/slurm/var/etc/slurm/slurm.conf + - /cm/shared/apps/slurm/var/etc/slurm/slurm.conf - /cm/shared/apps/slurm/var/etc/slurm/gres.conf # job_submit_plugin enable_job_submit_plugin: true job_submit_lua_url: "https://gitlab.rc.uab.edu/rc/slurm-factory/-/raw/main/etc/slurm/job_submit.lua" - job_submit_lua_dest: "/etc/slurm/job_submit.lua" \ No newline at end of file + job_submit_lua_dest: "/etc/slurm/job_submit.lua" diff --git a/proxy.yaml b/proxy.yaml index 35660d77..889a0ea2 100644 --- a/proxy.yaml +++ b/proxy.yaml @@ -2,5 +2,5 @@ - hosts: all become: true roles: - - { name: 'sshpiper', tags: 'sshpiper', when: enable_sshpiper } - - { name: 'ood_proxy', tags: 'ood_proxy', when: enable_ood_proxy } + - { name: 'ssh_proxy', tags: 'ssh_proxy', when: enable_ssh_proxy } + - { name: 'http_proxy', tags: 'http_proxy', when: enable_http_proxy } diff --git a/roles/ood_proxy/files/rewrite_map.py b/roles/http_proxy/files/rewrite_map.py similarity index 100% rename from roles/ood_proxy/files/rewrite_map.py rename to roles/http_proxy/files/rewrite_map.py diff --git a/roles/ood_proxy/files/rewritemap_config.py b/roles/http_proxy/files/rewritemap_config.py similarity index 100% rename from roles/ood_proxy/files/rewritemap_config.py rename to roles/http_proxy/files/rewritemap_config.py diff --git a/roles/ood_proxy/tasks/main.yml b/roles/http_proxy/tasks/main.yml similarity index 100% rename from roles/ood_proxy/tasks/main.yml rename to roles/http_proxy/tasks/main.yml diff --git a/roles/ood_proxy/templates/front-end_conf.j2 b/roles/http_proxy/templates/front-end_conf.j2 similarity index 100% rename from roles/ood_proxy/templates/front-end_conf.j2 rename to roles/http_proxy/templates/front-end_conf.j2 diff --git a/roles/sshpiper/tasks/main.yml b/roles/ssh_proxy/tasks/main.yml similarity index 100% rename from roles/sshpiper/tasks/main.yml rename to roles/ssh_proxy/tasks/main.yml diff --git a/roles/sshpiper/templates/sshpiperd.service.j2 b/roles/ssh_proxy/templates/sshpiperd.service.j2 similarity index 100% rename from roles/sshpiper/templates/sshpiperd.service.j2 rename to roles/ssh_proxy/templates/sshpiperd.service.j2 diff --git a/roles/sshpiper/templates/sshpiperd.yaml.j2 b/roles/ssh_proxy/templates/sshpiperd.yaml.j2 similarity index 100% rename from roles/sshpiper/templates/sshpiperd.yaml.j2 rename to roles/ssh_proxy/templates/sshpiperd.yaml.j2 From 7c9bad9aca4528d5a8f4059af0962904ba938f71 Mon Sep 17 00:00:00 2001 From: Bo-Chun Louis Chen Date: Wed, 13 Nov 2024 15:18:14 -0600 Subject: [PATCH 2/2] fix: remove ssh proxy role from ohpc-build --- ohpc-build.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/ohpc-build.yaml b/ohpc-build.yaml index df7ef67b..5d1c656b 100644 --- a/ohpc-build.yaml +++ b/ohpc-build.yaml @@ -12,5 +12,4 @@ - { name: 'ohpc_add_rstudio', tags: 'ohpc_add_rstudio', when: rstudio_provision } - { name: 'ohpc_user_reg', tags: 'ohpc_user_reg', when: enable_user_reg } - { name: 'ohpc_add_rabbitmq_agents', tags: 'ohpc_add_rabbitmq_agents', when: enable_user_reg } - - { name: 'sshpiper', tags: 'sshpiper', when: enable_sshpiper }