Merge branch 'vtest-v1.157-cleanup' into vtest-v1.157-merge

Author: wtripp180901

environments/nrel/hooks/pre.yml

@@ -41,8 +41,15 @@
   # tags: pre_tasks_all
   become: true
   tasks:
-    - include_role:
+    - name: Does vs_pre_complete.txt exist
+      ansible.builtin.stat:
+        path: /root/vs_pre_complete.txt
+      register: vs_pre_complete
+
+    - name: Pre tasks now
+      ansible.builtin.include_role:
         name: vshpc.prov.pre-tasks
+      when: not vs_pre_complete.stat.exists
 
 # TODO: KBENDL - check compatibility with new playbook
 - name: "NREL pre - Mount cephfs volumes"
@@ -52,80 +59,17 @@
     - aco.core.cephfs
   become: true
   tasks:
-    - include_role:
+    - name: Does ceph exist?
+      ansible.builtin.stat:
+        path: /etc/ceph
+      register: vs_does_cephdir
+    - name: CephFS now
+      ansible.builtin.include_role:
         name: aco.core.cephfs
       tags:
         - aco.core.cephfs
-
-    # - name: Set timezone to Americas/Denver
-    #   timezone:
-    #     name: America/Denver
-    #   tags:
-    #     - pre_set_time_on_servers
-
-    # - include_role:
-    #     name: aco.core.ntp
-    #   tags:
-    #     - pre_set_time_on_servers
-
-# - name: "NREL PRE - dnf packages"
-#   hosts: all
-#   tags: dnf_initial_update
-#   become: true
-#   tasks:
-#     - lineinfile:
-#         path: /etc/yum.repos.d/cuda-rhel8.repo
-#         regexp: '^enabled'
-#         line: enabled=0
-
-#     - name: dnf fix challenging dependency issues
-#       dnf:
-#         name: "*"
-#         nobest: true
-#         allowerasing: true
-#         skip_broken: true
-
-# - name: "NREL pre - set cluster root password"
-#   hosts: all
-#   tags: root_pass_cli
-#   become: true
-#   tasks:
-#     - name: include root if called
-#       include_role:
-#         name: root_pass_cli
-#       when: new_root_pass is defined
-
-# - name: "NREL pre - set admin hostnames to hpc.nrel.gov domain"
-#   hosts: control,login
-#   tags: set_hpc_hostname
-#   become: true
-#   tasks:
-#     - shell: "hostnamectl set-hostname {{ ansible_hostname }}.hpc.nrel.gov"
-
-# This may be fixed now
-# # ref: Error: cannot setup namespace using "/usr/bin/newuidmap": should have setuid or have filecaps setuid:
-# - name: "podman uid-gid workaround"
-#   hosts:
-#     - cluster
-#   become: true
-#   tags:
-#     - vs_pre
-#     - uid_gid_hack
-#   tasks:
-#     - name: "set newuidmap/newgidmap perms so containers will start"
-#       file:
-#         path: "{{ item }}"
-#         mode: '4755'
-#       loop:
-#         - /usr/bin/newgidmap
-#         - /usr/bin/newuidmap
-
-# TODO - get latest playbook
-# - name: Ensure yum repos are local
-#   hosts: all
-#   tags: ansible_yum_config
-#   become: true
-#   tasks:
-#     - include_role:
-#         name: ansible_yum_config
-# [email protected]:acoinf/vshpc.prov.pre-tasks.git
+      when: not vs_does_cephdir.stat.exists
+    - name: Tmp umount /home
+      ansible.builtin.shell: systemctl stop home.mount
+      when: not vs_does_cephdir.stat.exists
+      become: true