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
This commit is contained in:
parent
0681e25a52
commit
a944d049fb
@ -46,3 +46,8 @@ djangoopenstackauth_git_dest: "/opt/djangoopenstackauth_{{ djangoopenstackauth_g
|
|||||||
novncproxy_git_repo: https://github.com/kanaka/novnc
|
novncproxy_git_repo: https://github.com/kanaka/novnc
|
||||||
novncproxy_git_install_branch: a0e7ab43dca0ce11a713694ee4cf530bd3b17c5a
|
novncproxy_git_install_branch: a0e7ab43dca0ce11a713694ee4cf530bd3b17c5a
|
||||||
novncproxy_git_dest: "/opt/novnc_{{ novncproxy_git_install_branch | replace('/', '_') }}"
|
novncproxy_git_dest: "/opt/novnc_{{ novncproxy_git_install_branch | replace('/', '_') }}"
|
||||||
|
|
||||||
|
# spice-html5 from source
|
||||||
|
spicehtml5_git_repo: https://github.com/SPICE/spice-html5
|
||||||
|
spicehtml5_git_install_branch: c1e736b083ff47639ecb73ea9be4d14b5002f93f
|
||||||
|
spicehtml5_git_dest: "/opt/spicehtml5_{{ spicehtml5_git_install_branch | replace('/', '_') }}"
|
||||||
|
@ -114,6 +114,8 @@
|
|||||||
- role: "os_nova"
|
- role: "os_nova"
|
||||||
nova_novncproxy_git_repo: "{{ openstack_repo_git_url }}/novnc"
|
nova_novncproxy_git_repo: "{{ openstack_repo_git_url }}/novnc"
|
||||||
nova_novncproxy_git_install_branch: "{{ novncproxy_git_install_branch }}"
|
nova_novncproxy_git_install_branch: "{{ novncproxy_git_install_branch }}"
|
||||||
|
nova_spicehtml5_git_repo: "{{ openstack_repo_git_url }}/spice-html5"
|
||||||
|
nova_spicehtml5_git_install_branch: "{{ spicehtml5_git_install_branch }}"
|
||||||
nova_galera_address: "{{ internal_lb_vip_address }}"
|
nova_galera_address: "{{ internal_lb_vip_address }}"
|
||||||
tags:
|
tags:
|
||||||
- "os-nova"
|
- "os-nova"
|
||||||
@ -135,6 +137,8 @@
|
|||||||
- role: "system_crontab_coordination"
|
- role: "system_crontab_coordination"
|
||||||
tags:
|
tags:
|
||||||
- "system-crontab-coordination"
|
- "system-crontab-coordination"
|
||||||
|
vars_files:
|
||||||
|
- defaults/repo_packages/openstack_other.yml
|
||||||
vars:
|
vars:
|
||||||
galera_address: "{{ internal_lb_vip_address }}"
|
galera_address: "{{ internal_lb_vip_address }}"
|
||||||
ansible_hostname: "{{ container_name }}"
|
ansible_hostname: "{{ container_name }}"
|
||||||
|
@ -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_keymap: en-us
|
||||||
nova_spice_console_agent_enabled: True
|
nova_spice_console_agent_enabled: True
|
||||||
nova_spice_program_name: nova-spicehtml5proxy
|
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 novnc
|
||||||
nova_novncproxy_proto: http
|
nova_novncproxy_proto: http
|
||||||
|
@ -25,15 +25,29 @@
|
|||||||
- nova-apt-packages
|
- nova-apt-packages
|
||||||
- nova-spice-apt-packages
|
- nova-spice-apt-packages
|
||||||
|
|
||||||
- name: Install apt packages
|
- name: Remove apt packages
|
||||||
apt:
|
apt:
|
||||||
pkg: "{{ item }}"
|
pkg: "{{ item }}"
|
||||||
state: latest
|
state: absent
|
||||||
register: install_packages
|
register: remove_packages
|
||||||
until: install_packages|success
|
until: remove_packages|success
|
||||||
retries: 5
|
retries: 5
|
||||||
delay: 2
|
delay: 2
|
||||||
with_items: nova_spice_apt_packages
|
with_items: nova_spice_apt_packages
|
||||||
tags:
|
tags:
|
||||||
- nova-apt-packages
|
- nova-apt-packages
|
||||||
- nova-spice-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
|
||||||
|
Loading…
x
Reference in New Issue
Block a user