Fixed merge conflicts

roles/easy-rsa-certificate/tasks/buildCert.yml

@@ -33,8 +33,12 @@
   remote_user: "{{ hostvars[x509_ca_server]['ansible_ssh_user'] }}"
   delegate_to: "{{ x509_ca_server }}"
   shell: rm -rf /etc/easy-rsa/2.0/keys/{{ x509_common_name }}.*
+<<<<<<< HEAD
   when: cert is defined and cert.stat.size == 0
   sudo: true
+=======
+  when: cert.stat.exists == true and cert.stat.size == 0
+>>>>>>> fa3117e79a9bbcf686a4172081fa582f5d04d0d8
 
 - name: "set needcert if cert doesn't match key"
   set_fact: needcert=True

roles/slurm-build/tasks/main.yml

@@ -26,7 +26,7 @@
     creates: /root/rpmbuild/RPMS/x86_64/munge-{{ munge_version }}-1.el6.x86_64.rpm
 
 - name: get slurm
-  shell: wget http://www.schedmd.com/download/latest/slurm-{{ slurm_version }}.tar.bz2
+  shell: wget http://www.schedmd.com/download/archive/slurm-{{ slurm_version }}.tar.bz2
   args:
     chdir: /tmp
     creates: /tmp/slurm-{{ slurm_version }}.tar.bz2

roles/syncExports/templates/exports.j2

-{% for export in exportList %}
-{{ export.src }} {% for group in groupList %}{% for node in groups[group.name] %}{{ hostvars[node]['ansible_'+group.interface]['ipv4']['address'] }}({{ export.srvopts }}) {% endfor %}{% endfor %}
-
+{% set iplist = [] %}
+{% for group in groupList %}
+{% for node in groups[group.name] %}
+{% if hostvars[node]['ansible_'+group.interface] is defined %}
+{% if iplist.append(hostvars[node]['ansible_'+group.interface]['ipv4']['address']) %}
+{% endif %}
+{% endif %}
+{% endfor %}
 {% endfor %}
+
+{{ export.src }} {% for ip in iplist|unique %}{{ ip }}{{ export.srvopts }} {% endfor %}

roles/vncserver/tasks/main.yml

+---
+- include_vars: "{{ hostvars[ansible_hostname]['ansible_distribution'] }}_{{ ansible_architecture }}.yml"
+
+- name: add repos apt
+  shell: "add-apt-repository -y 'deb {{ item }} {{ ansible_distribution_release }} main' "
+  sudo: true
+  with_items: apt_repos
+  when: ansible_os_family == 'Debian'
+
+- name: install system packages apt
+  apt: name={{ item }} state=installed update_cache=true  force=yes
+  sudo: true
+  with_items: system_packages
+  when: ansible_os_family == 'Debian'
+
+- name: install system packages yum
+  yum: name={{ item }} state=installed
+  sudo: true
+  with_items: system_packages
+  when: ansible_os_family == 'RedHat'

roles/vncserver/vars/CentOS_x86_64.yml

+---
+ system_packages:
+   - "@desktop"
+   - tigervnc-server

roles/vncserver/vars/Ubuntu_x86_64.yml

+---
+ system_packages:
+   - mate-desktop-environment
+   - tightvncserver
+
+ apt_repos:
+   - "http://repo.mate-desktop.org/archive/1.8/ubuntu"