Merge branch 'upstream_master'
Conflicts: roles/slurm-common/tasks/installNhc.yml conflicts resolved manually
Showing
- dynamicInventory 0 additions, 141 deletionsdynamicInventory
- provisionCluster.yaml 0 additions, 41 deletionsprovisionCluster.yaml
- roles/SSHKnownHosts/tasks/main.yml 4 additions, 0 deletionsroles/SSHKnownHosts/tasks/main.yml
- roles/apt-get-update/tasks/main.yml 0 additions, 5 deletionsroles/apt-get-update/tasks/main.yml
- roles/calculateEtcHosts/tasks/main.yml 1 addition, 1 deletionroles/calculateEtcHosts/tasks/main.yml
- roles/calculateEtcHosts/templates/groups.j2 8 additions, 1 deletionroles/calculateEtcHosts/templates/groups.j2
- roles/calculateKnownHosts/tasks/main.yml 13 additions, 0 deletionsroles/calculateKnownHosts/tasks/main.yml
- roles/calculateKnownHosts/templates/known_hosts.j2 4 additions, 5 deletionsroles/calculateKnownHosts/templates/known_hosts.j2
- roles/calculateSlurmConf/templates/slurm.conf.j2 4 additions, 0 deletionsroles/calculateSlurmConf/templates/slurm.conf.j2
- roles/config_repos/files/glusterfs-epel.repo 3 additions, 3 deletionsroles/config_repos/files/glusterfs-epel.repo
- roles/config_repos/tasks/main.yml 43 additions, 0 deletionsroles/config_repos/tasks/main.yml
- roles/cvlExtraFiles/tasks/main.yml 1 addition, 2 deletionsroles/cvlExtraFiles/tasks/main.yml
- roles/easy-rsa-certificate/tasks/buildCert.yml 5 additions, 5 deletionsroles/easy-rsa-certificate/tasks/buildCert.yml
- roles/enable_lmod/tasks/main.yml 0 additions, 10 deletionsroles/enable_lmod/tasks/main.yml
- roles/enable_sudo_group/tasks/main.yml 4 additions, 0 deletionsroles/enable_sudo_group/tasks/main.yml
- roles/enable_sudo_group/templates/10-admin_group.j2 1 addition, 0 deletionsroles/enable_sudo_group/templates/10-admin_group.j2
- roles/etcHosts/tasks/main.yml 11 additions, 1 deletionroles/etcHosts/tasks/main.yml
- roles/etcHosts/templates/hostname 1 addition, 0 deletionsroles/etcHosts/templates/hostname
- roles/extra_rpms/tasks/main.yml 14 additions, 2 deletionsroles/extra_rpms/tasks/main.yml
- roles/extra_rpms/vars/main.yml 1 addition, 0 deletionsroles/extra_rpms/vars/main.yml
Loading
Please register or sign in to comment