From 35545452bf6e64c8ac22ec8c26d593c5861bd18d Mon Sep 17 00:00:00 2001
From: Jimmy McCrory <jimmy.mccrory@gmail.com>
Date: Tue, 22 Sep 2015 10:46:48 -0700
Subject: [PATCH] Install spice-html5 from source

'ws://' is currently hardcoded within the spice_auto.html file included
in the packaged release of spice-html5, raising a security error when
accessing consoles over HTTPS.

Remove the existing apt package and install spice-html5 from source
instead since this issue has been corrected as of spice-html5-0.1.6.

Change-Id: Ie308a477143037963f903f2ac21b2b1f0328fcb3
Partial-Bug: #1424797
---
 defaults/main.yml                    |  2 ++
 tasks/nova_console_spice_install.yml | 22 ++++++++++++++++++----
 2 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/defaults/main.yml b/defaults/main.yml
index 562afb53..8fbd313a 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -165,6 +165,8 @@ nova_spice_html5proxy_base_url: "{{ nova_spice_html5proxy_base_uri }}/spice_auto
 nova_spice_console_keymap: en-us
 nova_spice_console_agent_enabled: True
 nova_spice_program_name: nova-spicehtml5proxy
+nova_spicehtml5_git_repo: https://github.com/SPICE/spice-html5
+nova_spicehtml5_git_install_branch: master
 
 ## Nova novnc
 nova_novncproxy_proto: http
diff --git a/tasks/nova_console_spice_install.yml b/tasks/nova_console_spice_install.yml
index c98dfae1..966130dd 100644
--- a/tasks/nova_console_spice_install.yml
+++ b/tasks/nova_console_spice_install.yml
@@ -25,15 +25,29 @@
     - nova-apt-packages
     - nova-spice-apt-packages
 
-- name: Install apt packages
+- name: Remove apt packages
   apt:
     pkg: "{{ item }}"
-    state: latest
-  register: install_packages
-  until: install_packages|success
+    state: absent
+  register: remove_packages
+  until: remove_packages|success
   retries: 5
   delay: 2
   with_items: nova_spice_apt_packages
   tags:
     - nova-apt-packages
     - nova-spice-apt-packages
+
+- name: Get package from git
+  git:
+    repo: "{{ nova_spicehtml5_git_repo }}"
+    dest: "/usr/share/spice-html5"
+    clone: "yes"
+    update: "yes"
+    version: "{{ nova_spicehtml5_git_install_branch }}"
+  register: git_clone
+  until: git_clone|success
+  retries: 5
+  delay: 2
+  tags:
+    - nova-spice-git