From 59d20b7333a97a6812ac8bc192ae4cc768864067 Mon Sep 17 00:00:00 2001
From: Chris Hines <chris.hines@monash.edu>
Date: Wed, 29 Apr 2015 00:39:14 +0000
Subject: [PATCH] update vncserver role to make it more likely to work on other
OSs
---
roles/vncserver/tasks/main.yml | 17 ++++++++++++++++-
roles/vncserver/vars/CentOS_7_x86_64.yml | 15 +++++++++++++++
roles/vncserver/vars/CentOS_x86_64.yml | 1 +
roles/vncserver/vars/Ubuntu_x86_64.yml | 2 ++
4 files changed, 34 insertions(+), 1 deletion(-)
create mode 100644 roles/vncserver/vars/CentOS_7_x86_64.yml
diff --git a/roles/vncserver/tasks/main.yml b/roles/vncserver/tasks/main.yml
index db122510..59b754ea 100644
--- a/roles/vncserver/tasks/main.yml
+++ b/roles/vncserver/tasks/main.yml
@@ -2,6 +2,9 @@
#- include_vars: "{{ hostvars[ansible_hostname]['ansible_distribution'] }}_{{ ansible_architecture }}.yml"
- include_vars: "{{ ansible_distribution }}_{{ ansible_architecture }}.yml"
+- include_vars: "CentOS_7_x86_64.yml"
+ when: ansible_distribution == "CentOS" and ansible_distribution_major_version == "7"
+
# Use mate DE on systems that have moved to gnome3, since there is no gpu acceleration by default on NeCTAR openstack
# Trusty (Ubuntu 14.04 LTS) needs repos added. Wheezy (Debian Stable) gets mate from backports, Utopic (Ubuntu 14.10) Jessie (Debian testing) and Sid (Debian unstable) get it by default
- name: add repos apt
@@ -14,6 +17,18 @@
sudo: true
when: ansible_distribution_release == 'trusty'
+- name: add epel on CentOS 7
+ shell: rpm -iUvh http://dl.fedoraproject.org/pub/epel/7/x86_64/e/epel-release-7-5.noarch.rpm
+ sudo: true
+ when: ansible_distribution == "CentOS" and ansible_distribution_major_version == "7"
+ ignore_errors: true
+
+- name: add epel on CentOS 7
+ shell: yum -y update
+ sudo: true
+ when: ansible_distribution == "CentOS" and ansible_distribution_major_version == "7"
+
+
- name: install system packages apt
apt: name={{ item }} state=installed update_cache=true force=yes
sudo: true
@@ -21,7 +36,7 @@
when: ansible_os_family == 'Debian'
- name: install system packages yum
- yum: name={{ item }} state=installed
+ yum: name={{ item }} state=installed update_cache=yes
sudo: true
with_items: system_packages
when: ansible_os_family == 'RedHat'
diff --git a/roles/vncserver/vars/CentOS_7_x86_64.yml b/roles/vncserver/vars/CentOS_7_x86_64.yml
new file mode 100644
index 00000000..a30a4a2f
--- /dev/null
+++ b/roles/vncserver/vars/CentOS_7_x86_64.yml
@@ -0,0 +1,15 @@
+---
+ system_packages:
+ - "@desktop"
+ - tigervnc-server
+ - "@xfce"
+ - libXcomposite
+ - libXdamage
+ - mesa-libEGL
+ - mesa-libgbm
+ - harfbuzz
+ - mesa-libglapi
+ - graphite2
+ - xterm
+ - libpng
+ - "@MATE Desktop"
diff --git a/roles/vncserver/vars/CentOS_x86_64.yml b/roles/vncserver/vars/CentOS_x86_64.yml
index 640f11fb..66651a5d 100644
--- a/roles/vncserver/vars/CentOS_x86_64.yml
+++ b/roles/vncserver/vars/CentOS_x86_64.yml
@@ -2,3 +2,4 @@
system_packages:
- "@desktop"
- tigervnc-server
+ - "@xfce"
diff --git a/roles/vncserver/vars/Ubuntu_x86_64.yml b/roles/vncserver/vars/Ubuntu_x86_64.yml
index db569565..da1e1e24 100644
--- a/roles/vncserver/vars/Ubuntu_x86_64.yml
+++ b/roles/vncserver/vars/Ubuntu_x86_64.yml
@@ -2,3 +2,5 @@
system_packages:
- mate-desktop-environment
- tightvncserver
+ - xfce4-session
+ - xfwm4
--
GitLab