address review comments

Author: bertiethorpe

ansible/filesystems.yml

@@ -23,23 +23,4 @@
   tags: manila
   tasks:
     - include_role:
-        name: stackhpc.os-manila-mount
-
-- name: Manage /exports/cluster and Manila share info
-  hosts: control
-  become: true
-  tasks:
-    - block:
-        - name: Ensure /exports/cluster directory exists
-          file: 
-            path: /exports/cluster
-            state: directory
-            owner: root
-            group: root
-            mode: 0755
-
-        - name: Copy manila share info to /exports/cluster
-          copy:
-            content: "{{ os_manila_mount_share_info | to_nice_yaml }}"
-            dest: "/exports/cluster/manila_share_info.yml"
-      when: os_manila_mount_share_info is defined
+        name: stackhpc.os-manila-mount

ansible/roles/compute_init/files/compute-init.yml

@@ -6,8 +6,6 @@
   # VARS TO BE SUPPLIED VIA CLOUD INIT METADATA
   vars:
     control_node_ip: "172.16.1.228"
-    nfs_export_hosts: "/exports/hosts"
-    nfs_export_cluster: "/exports/cluster"
     resolv_conf_nameservers: [1.1.1.1, 8.8.8.8]
 
 
@@ -53,7 +51,7 @@
     cvmfs_config_overrides: {}
     cvmfs_config: "{{ cvmfs_config_default | combine(cvmfs_config_overrides) }}"
 
-    openhpc_conf_server: control_node_ip
+    openhpc_conf_server: "{{ control_node_ip }}"
     openhpc_gres_template: /etc/ansible-init/templates/gres.conf.j2
     openhpc_slurm_service_enabled: true
     openhpc_slurm_service_started: "{{ openhpc_slurm_service_enabled }}"
@@ -90,25 +88,25 @@
           when: _copy_nm_config.changed | default(false)
 
 
-    - name: Mount /etc/hosts on compute nodes
+    - name: Mount /mnt/cluster on compute nodes and copy hosts to /etc/hosts
       block:
         - name: Ensure the mount directory exists
           file:
-            path: /mnt/hosts
+            path: /mnt/cluster
             state: directory
             mode: 0755
 
-        - name: Mount /mnt/hosts
+        - name: Mount /mnt/cluster
           mount:
-            path: /mnt/hosts
-            src: "{{ vars.control_node_ip }}:{{ nfs_export_hosts }}"
+            path: /mnt/cluster
+            src: "{{ vars.control_node_ip }}:/exports/cluster"
             fstype: nfs
             opts: rw,sync
             state: mounted
 
-        - name: Copy /mnt/hosts/hosts contents to /etc/hosts
+        - name: Copy /mnt/cluster/hosts contents to /etc/hosts
           copy:
-            src: /mnt/hosts/hosts
+            src: /mnt/cluster/hosts
             dest: /etc/hosts
             owner: root
             group: root
@@ -128,27 +126,13 @@
             src: "{{ nfs_server }}:{{ nfs_export }}"
             fstype: nfs
             state: "{{ nfs_client_mnt_state }}"
-        
-        - name: Ensure the mount directory exists
-          file:
-            path: /mnt/
-            state: directory
-            mode: 0755
-        
-        - name: Mount /mnt/
-          mount:
-            path: /mnt/
-            src: "{{ vars.control_node_ip }}:{{ nfs_export_cluster }}"
-            fstype: nfs
-            opts: rw,sync
-            state: mounted
 
 
     - name: Manila mount
       block:
         - name: Read manila share from nfs file
           slurp:
-            src: "/mnt/manila_share_info.yml"
+            src: "/mnt/cluster/manila_share_info.yml"
           register: manila_share_info_file
 
         - name: Parse and set fact for manila share info
@@ -293,7 +277,7 @@
 
         - name: Copy Munge key from NFS-mounted directory to /etc/munge
           copy:
-            src: "/mnt/openhpc_munge.key"
+            src: "/mnt/cluster/openhpc_munge.key"
             dest: "/etc/munge/munge.key"
             owner: munge
             group: munge

ansible/roles/compute_init/tasks/main.yml

@@ -1,12 +1,17 @@
 ---
 
-- name: Ensure templates directory exists
+- name: Ensure directories exist
   file: 
-    path: /etc/ansible-init/templates
+    path: "/etc/ansible-init/{{ item.directory }}"
     state: directory
     owner: root
     group: root
-    mode: 0644
+    mode: 0755
+  loop:
+    - { directory: "templates" }
+    - { directory: "files" }
+    - { directory: "library" }
+    - { directory: "filter_plugins" }
 
 - name: Inject templates
   copy:
@@ -21,14 +26,6 @@
     - ../../stackhpc.os-manila-mount/templates/ceph.keyring.j2
     - ../../stackhpc.openhpc/templates/gres.conf.j2
 
-- name: Ensure files directory exists
-  file: 
-    path: /etc/ansible-init/files
-    state: directory
-    owner: root
-    group: root
-    mode: 0644
-
 - name: Inject files
   copy:
     src: '{{ item }}'
@@ -39,14 +36,6 @@
   loop:
     - ../../resolv_conf/files/NetworkManager-dns-none.conf
 
-- name: Ensure library directory exists
-  file: 
-    path: /etc/ansible-init/library
-    state: directory
-    owner: root
-    group: root
-    mode: 0644
-
 - name: Inject files
   copy:
     src: '{{ item }}'
@@ -59,14 +48,6 @@
     - ../../stackhpc.os-manila-mount/library/os_manila_share.py
     - ../../stackhpc.openhpc/library/sacct_cluster.py
 
-- name: Ensure filter_plugins directory exists
-  file: 
-    path: /etc/ansible-init/filter_plugins
-    state: directory
-    owner: root
-    group: root
-    mode: 0644
-
 - name: Inject filter_plugins
   copy:
     src: '{{ item }}'
@@ -87,15 +68,39 @@
     group: root
     mode: 0644
 
-- name: Write openhpc munge key
-  copy:
-    content: "{{ vault_openhpc_mungekey | b64decode }}"
-    dest: "/exports/cluster/openhpc_munge.key"
-    owner: munge
-    group: munge
-    mode: 0400
-  delegate_to: "{{ groups['control'] | first }}"
+- name: Ensure nfs /exports/cluster configured
+  block:
+    - name: Ensure the /exports/hosts directory exists
+      file:
+        path: /exports/cluster
+        state: directory
+        owner: root
+        group: root
+        mode: 0755
 
+    - name: Copy /etc/hosts to /exports/cluster
+      copy:
+        src: /etc/hosts
+        dest: /exports/cluster/hosts
+        owner: root
+        group: root
+        mode: 0644
+        remote_src: true
+
+    - name: Copy manila share info to /exports/cluster
+      copy:
+        content: "{{ os_manila_mount_share_info | to_nice_yaml }}"
+        dest: "/exports/cluster/manila_share_info.yml"
+      when: os_manila_mount_share_info is defined
+
+    - name: Write openhpc munge key
+      copy:
+        content: "{{ vault_openhpc_mungekey | b64decode }}"
+        dest: "/exports/cluster/openhpc_munge.key"
+        owner: munge
+        group: munge
+        mode: 0400
+  delegate_to: "{{ groups['control'] | first }}"
 
 - name: Inject compute initialisation playbook
   copy:

ansible/roles/etc_hosts/tasks/main.yml

@@ -6,26 +6,3 @@
     group: root
     mode: 0644
   become: yes
-
-- name: Ensure /exports/hosts directory exists and copy /etc/hosts
-  block:
-    - name: Ensure the /exports/hosts directory exists
-      file:
-        path: /exports/hosts
-        state: directory
-        owner: root
-        group: root
-        mode: 0755
-      become: yes
-      delegate_to: "{{ groups['control'] | first }}"
-
-    - name: Copy /etc/hosts to NFS exported directory
-      copy:
-        src: /etc/hosts
-        dest: /exports/hosts/hosts
-        owner: root
-        group: root
-        mode: 0644
-        remote_src: true
-      become: yes
-      delegate_to: "{{ groups['control'] | first }}"

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

@@ -16,15 +16,8 @@ nfs_configurations:
     nfs_export: "/exports/home" # assumes skeleton TF is being used
     nfs_client_mnt_point: "/home"
 
-  - comment: Export /etc/hosts copy from Slurm control node
+  - comment: Export /exports/cluster from Slurm control node
     nfs_enable:
         server: "{{ inventory_hostname in groups['control'] }}"
         clients: false
-    nfs_export: "/exports/hosts" # control node has to copy in /etc/hosts to here
-
-  - comment: Export cluster info from control node
-    nfs_enable:
-      server: "{{ inventory_hostname in groups['control']}}"
-      clients: "{{ inventory_hostname in groups['cluster'] and inventory_hostname not in groups['control'] }}"
-    nfs_server: "{{ nfs_server_default }}"
-    nfs_export: "/exports/cluster"
+    nfs_export: "/exports/cluster" # control node has to copy in /etc/hosts to here