diff --git a/roles/nfs-client/handlers/main.yml b/roles/nfs-client/handlers/main.yml index 23604e7bfb2f8c62f87cab1f38f290cf524b53be..d03ebd197c4a7e0160cf74834b78a625b71aefda 100644 --- a/roles/nfs-client/handlers/main.yml +++ b/roles/nfs-client/handlers/main.yml @@ -7,9 +7,3 @@ service: name=rpcidmapd state=restarted sudo: true when: ansible_os_family == "RedHat" - -- name: restart authentication - service: name=authentication state=restarted - sudo: true - when: ansible_os_family == "Debian" - diff --git a/roles/nfs-client/tasks/mountFileSystem.yml b/roles/nfs-client/tasks/mountFileSystem.yml index 53abd33de55622d44c001ab2f186a0335198bc50..70cc74b6ec75619c5fd1352e79c9b21d9b99686a 100644 --- a/roles/nfs-client/tasks/mountFileSystem.yml +++ b/roles/nfs-client/tasks/mountFileSystem.yml @@ -6,7 +6,6 @@ - name: "Mounting NFS mounts" mount: name={{ item.name }} src=" {{ item.ipv4 }}:{{ item.src }} " fstype={{ item.fstype }} opts={{ item.opts }} state=mounted with_items: nfsMounts - notify: "restart authentication" notify: "restart rpcbind" notify: "restart idmap" sudo: true @@ -22,7 +21,6 @@ - name: "Mounting NFS mounts" mount: name={{ item.name }} src=" {{ item.ipv4 }}:{{ item.src }} " fstype={{ item.fstype }} opts={{ item.opts }} state=mounted with_items: nfsMounts - notify: "restart authentication" notify: "restart idmap" notify: "restart rpcbind" sudo: true diff --git a/roles/provision/tasks/main.yml b/roles/provision/tasks/main.yml new file mode 100644 index 0000000000000000000000000000000000000000..3b71e4d40f287e6fefd0be5763aa05e8ec406b1a --- /dev/null +++ b/roles/provision/tasks/main.yml @@ -0,0 +1,8 @@ +--- +- name: copy provision template + template: src=provision.sh.j2 dest={{ provision }} mode=755 owner=root + sudo: true + +- name: provision cron job + cron: name=provision job={{ provision }} user=root minute=*/5 state=present + sudo: true diff --git a/roles/slurm-provision/templates/slurm_provision.sh.j2 b/roles/provision/templates/provision.sh.j2 similarity index 100% rename from roles/slurm-provision/templates/slurm_provision.sh.j2 rename to roles/provision/templates/provision.sh.j2 diff --git a/roles/slurm-provision/vars/main.yml b/roles/provision/vars/main.yml similarity index 100% rename from roles/slurm-provision/vars/main.yml rename to roles/provision/vars/main.yml diff --git a/roles/slurm-provision/vars/readme.txt b/roles/provision/vars/readme.txt similarity index 100% rename from roles/slurm-provision/vars/readme.txt rename to roles/provision/vars/readme.txt diff --git a/roles/slurm-provision/tasks/main.yml b/roles/slurm-provision/tasks/main.yml deleted file mode 100644 index 9ce33797bc3833cbaaef82426124b025ce507730..0000000000000000000000000000000000000000 --- a/roles/slurm-provision/tasks/main.yml +++ /dev/null @@ -1,8 +0,0 @@ ---- -- name: copy slurm provision template - template: src=slurm_provision.sh.j2 dest={{ slurm_provision }} mode=755 owner=root - sudo: true - -- name: slurm cron job - cron: name=slurm_provision job={{ slurm_provision }} user=root minute=*/5 state=present - sudo: true