Fix novnc console include positioning

Currently the nova console (spice/novnc) includes happen before the
venv validation/download in nova_install. While this works for spice
(the default) because it doesn't use the nova venv, novnc does, which
breaks nova console install when novnc is enabled. This patch moves
the include for novnc (and spice) to after the venv checksum/download.

Change-Id: I8c6fb525727c177ef69d8ac5fa915840643a12a8
This commit is contained in:
Adam Reznechek 2016-09-14 19:15:55 -05:00 committed by Kevin Carter
parent 70d72d6a50
commit 9e998b52ee

View File

@ -17,20 +17,6 @@
when:
- ansible_pkg_mgr == 'apt'
- include: nova_console_spice_install.yml
when:
- inventory_hostname in groups['nova_console']
- nova_console_type == "spice"
tags:
- nova-spice-console
- include: nova_console_novnc_install.yml
when:
- inventory_hostname in groups['nova_console']
- nova_console_type == "novnc"
tags:
- nova-novnc-console
- name: Create developer mode constraint file
copy:
dest: "/opt/developer-pip-constraints.txt"
@ -196,3 +182,17 @@
tags:
- nova-install
- nova-pip-packages
- include: nova_console_spice_install.yml
when:
- inventory_hostname in groups['nova_console']
- nova_console_type == "spice"
tags:
- nova-spice-console
- include: nova_console_novnc_install.yml
when:
- inventory_hostname in groups['nova_console']
- nova_console_type == "novnc"
tags:
- nova-novnc-console