diff --git a/vars/distro_install.yml b/vars/distro_install.yml index 7a9dc071..f6e62c1f 100644 --- a/vars/distro_install.yml +++ b/vars/distro_install.yml @@ -30,6 +30,9 @@ nova_package_list: |- {% if nova_console_type == 'spice' %} {% set _ = packages.extend(nova_service_extra_distro_packages['spice']) %} {% endif %} + {% if nova_console_type == 'serialconsole' %} + {% set _ = packages.extend(nova_service_extra_distro_packages['serialconsole']) %} + {% endif %} {% endif %} {% if nova_services['nova-compute']['group'] in group_names %} {% if nova_virt_type in ['kvm', 'qemu'] %} diff --git a/vars/redhat-7.yml b/vars/redhat-7.yml index 32e3411e..1545f188 100644 --- a/vars/redhat-7.yml +++ b/vars/redhat-7.yml @@ -32,18 +32,11 @@ nova_devel_distro_packages: - which nova_service_distro_packages: - - openstack-nova - openstack-nova-api - - openstack-nova-cells - - openstack-nova-compute - openstack-nova-conductor - openstack-nova-console - - openstack-nova-migration - - openstack-nova-network - - openstack-nova-novncproxy - openstack-nova-placement-api - openstack-nova-scheduler - - openstack-nova-serialproxy - python-memcached - python-novaclient - python2-PyMySQL @@ -51,12 +44,16 @@ nova_service_distro_packages: - uwsgi-plugin-python nova_service_extra_distro_packages: - kvm: [] + kvm: + - openstack-nova-compute + - openstack-nova-migration lxd: [] novnc: - openstack-nova-novncproxy spice: - openstack-nova-spicehtml5proxy + serialconsole: + - openstack-nova-serialproxy nova_novnc_distro_packages: - js-jquery diff --git a/vars/suse.yml b/vars/suse.yml index 8546471d..ac523ee6 100644 --- a/vars/suse.yml +++ b/vars/suse.yml @@ -33,19 +33,11 @@ nova_devel_distro_packages: - which nova_service_distro_packages: - - openstack-nova - openstack-nova-api - - openstack-nova-cells - - openstack-nova-compute - openstack-nova-conductor - - openstack-nova-console - openstack-nova-consoleauth - - openstack-nova-network - - openstack-nova-novncproxy - openstack-nova-placement-api - openstack-nova-scheduler - - openstack-nova-serialproxy - - openstack-nova-vncproxy - python-memcached - python-novaclient - python-PyMySQL @@ -53,11 +45,14 @@ nova_service_distro_packages: - uwsgi-python nova_service_extra_distro_packages: - kvm: [] + kvm: + - openstack-nova-compute lxd: [] novnc: - openstack-nova-novncproxy spice: [] + serialconsole: + - openstack-nova-serialproxy nova_novnc_distro_packages: - python-websockify diff --git a/vars/ubuntu.yml b/vars/ubuntu.yml index bbc12ed6..b969e6e9 100644 --- a/vars/ubuntu.yml +++ b/vars/ubuntu.yml @@ -33,16 +33,10 @@ nova_devel_distro_packages: nova_service_distro_packages: - nova-api - - nova-cells - nova-conductor - - nova-console - nova-consoleauth - - nova-network - - nova-novncproxy - nova-placement-api - nova-scheduler - - nova-serialproxy - - nova-volume - python-memcache - python-novaclient - python-pymysql @@ -59,6 +53,8 @@ nova_service_extra_distro_packages: - nova-novncproxy spice: - nova-spiceproxy + serialconsole: + - openstack-nova-serialproxy nova_novnc_distro_packages: - libjs-jquery