Merge "Updated spice-html5 git repository URL"

This commit is contained in:
Zuul 2018-06-06 09:53:53 +00:00 committed by Gerrit Code Review
commit 2bc567516f
2 changed files with 9 additions and 3 deletions

View File

@ -208,7 +208,7 @@ nova_spice_html5proxy_base_port: 6082
nova_spice_html5proxy_base_uri: "{{ nova_spice_html5proxy_base_proto }}://{{ external_lb_vip_address }}:{{ nova_spice_html5proxy_base_port }}"
nova_spice_html5proxy_base_url: "{{ nova_spice_html5proxy_base_uri }}/spice_auto.html"
nova_spice_console_agent_enabled: True
nova_spicehtml5_git_repo: https://github.com/SPICE/spice-html5
nova_spicehtml5_git_repo: https://gitlab.freedesktop.org/spice/spice-html5
nova_spicehtml5_git_install_branch: master
## Nova novnc

View File

@ -22,7 +22,10 @@
- openstack-ansible-functional-centos-7-nv
- openstack-ansible-functional-opensuse-423
- openstack-ansible-functional-ubuntu-xenial
- openstack-ansible-upgrade-ubuntu-xenial
# TODO(evrardjp): Restore upgrade checks
# when git url of spice has been updated in
# all branches.
#- openstack-ansible-upgrade-ubuntu-xenial
- openstack-ansible-lxd-ubuntu-xenial
- openstack-ansible-nova-ssl-nv
experimental:
@ -37,5 +40,8 @@
#- openstack-ansible-functional-centos-7
- openstack-ansible-functional-opensuse-423
- openstack-ansible-functional-ubuntu-xenial
- openstack-ansible-upgrade-ubuntu-xenial
# TODO(evrardjp): Restore upgrade checks
# when git url of spice has been updated in
# all branches.
#- openstack-ansible-upgrade-ubuntu-xenial
- openstack-ansible-lxd-ubuntu-xenial