From 1fe56e8fe8e4b410303db058cf45b99df0b1b6fd Mon Sep 17 00:00:00 2001 From: Edwin Skidmore Date: Tue, 18 Aug 2020 15:04:58 -0700 Subject: [PATCH] fixed the atmo_check_novnc.yml --- ansible/playbooks/utils/atmo_check_novnc.yml | 2 +- ansible/roles/atmo-check-novnc/tasks/main.yml | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/ansible/playbooks/utils/atmo_check_novnc.yml b/ansible/playbooks/utils/atmo_check_novnc.yml index 75a7dfb64..ff70c2b07 100644 --- a/ansible/playbooks/utils/atmo_check_novnc.yml +++ b/ansible/playbooks/utils/atmo_check_novnc.yml @@ -2,4 +2,4 @@ - name: Playbook to fail when VNC is not running hosts: all roles: - - { role: atmo-check-novnc, when: SETUP_NOVNC is defined and SETUP_NOVNC == true } + - { role: atmo-check-novnc, when: SETUP_GUACAMOLE is defined and SETUP_GUACAMOLE == true } diff --git a/ansible/roles/atmo-check-novnc/tasks/main.yml b/ansible/roles/atmo-check-novnc/tasks/main.yml index ceb754404..c67f5739e 100644 --- a/ansible/roles/atmo-check-novnc/tasks/main.yml +++ b/ansible/roles/atmo-check-novnc/tasks/main.yml @@ -32,9 +32,7 @@ - x - name: check to see if VNC server is running - shell: /bin/ps aux | /bin/grep "/usr/bin/Xvnc-core :1 -auth /home/{{ ATMOUSERNAME }}/" | /bin/grep -v grep - ignore_errors: yes - failed_when: False + shell: /bin/ps aux | /bin/grep "/usr/bin/Xvnc-core :5 -auth /home/{{ ATMOUSERNAME }}/" | /bin/grep -v grep register: vnc_state tags: - vnc @@ -52,4 +50,3 @@ tags: - vnc - check-vnc -