Merge "Cleanup debian nova service distro package list"

templates/nova-uwsgi.ini.j2

@@ -6,6 +6,9 @@ gid = {{ nova_system_group_name }}
 {% if nova_install_method == 'source' %}
 virtualenv = /openstack/venvs/nova-{{ nova_venv_tag }}
 {% endif %}
+{% if nova_install_method == 'distro' and (ansible_os_family | lower) == 'debian' %}
+plugin = python3
+{% endif %}
 wsgi-file = {{ nova_bin }}/{{ item.wsgi_name }}
 http = 0.0.0.0:{{ item.uwsgi_port }}
 

vars/debian.yml

@@ -33,15 +33,8 @@ nova_devel_distro_packages:
   - python-httplib2
 
 nova_service_distro_packages:
-  - nova-api
+  - python3-nova
-  - nova-conductor
+  - python3-memcache
-  - nova-scheduler
-  - python-memcache
-  - python-novaclient
-  - python-pymysql
-  - python-sqlalchemy
-  - uwsgi
-  - uwsgi-plugin-python
 
 nova_service_extra_distro_packages:
   kvm:
@@ -50,6 +43,9 @@ nova_service_extra_distro_packages:
     - nova-compute-lxd
   novnc:
     - nova-novncproxy
+  nova_api:
+    - uwsgi
+    - uwsgi-plugin-python3
   spice:
     - nova-spiceproxy
   serialconsole:

vars/distro_install.yml

@@ -20,6 +20,10 @@
 #
 nova_package_list: |-
   {% set packages = nova_distro_packages %}
+  {% if nova_services['nova-api-metadata']['group'] in group_names or
+        nova_services['nova-api-os-compute']['group'] in group_names %}
+  {%      set _ = packages.extend(nova_service_extra_distro_packages['nova_api']) %}
+  {% endif %}
   {% if nova_services['nova-novncproxy']['group'] in group_names or
       nova_services['nova-spicehtml5proxy']['group'] in group_names or
       nova_services['nova-serialconsole-proxy']['group'] in group_names %}

vars/redhat-7.yml

@@ -38,8 +38,6 @@ nova_service_distro_packages:
   - python-memcached
   - python-novaclient
   - python2-PyMySQL
-  - uwsgi
-  - uwsgi-plugin-python
 
 nova_service_extra_distro_packages:
   kvm:
@@ -48,6 +46,9 @@ nova_service_extra_distro_packages:
   lxd: []
   novnc:
     - openstack-nova-novncproxy
+  nova_api:
+    - uwsgi
+    - uwsgi-plugin-python
   spice:
     - openstack-nova-spicehtml5proxy
   serialconsole:

vars/suse.yml

@@ -40,8 +40,6 @@ nova_service_distro_packages:
   - python-memcached
   - python-novaclient
   - python-PyMySQL
-  - uwsgi
-  - uwsgi-python
 
 nova_service_extra_distro_packages:
   kvm:
@@ -49,6 +47,9 @@ nova_service_extra_distro_packages:
   lxd: []
   novnc:
     - openstack-nova-novncproxy
+  nova_api:
+    - uwsgi
+    - uwsgi-python
   spice: []
   serialconsole:
     - openstack-nova-serialproxy