Merge "Drop nova-consoleauth service"

defaults/main.yml

@@ -465,7 +465,6 @@ nova_api_metadata_init_overrides: {}
 nova_api_os_compute_init_overrides: {}
 nova_compute_init_overrides: {}
 nova_conductor_init_overrides: {}
-nova_consoleauth_init_overrides: {}
 nova_novncproxy_init_overrides: {}
 nova_scheduler_init_overrides: {}
 nova_spicehtml5proxy_init_overrides: {}
@@ -514,12 +513,6 @@ nova_services:
     start_order: 2
     execstarts: "{{ nova_bin }}/nova-conductor"
     execreloads: "/bin/kill -HUP $MAINPID"
-  nova-consoleauth:
-    group: nova_console
-    service_name: nova-consoleauth
-    init_config_overrides: "{{ nova_consoleauth_init_overrides }}"
-    start_order: 3
-    execstarts: "{{ nova_bin }}/nova-consoleauth"
   nova-novncproxy:
     group: nova_console
     service_name: nova-novncproxy

tasks/main.yml

@@ -170,6 +170,31 @@
     - nova-config
     - systemd-service
 
+# NOTE(mnaser): Remove this task in Train
+- name: Disable deprecated nova-consoleauth service
+  service:
+    name: nova-consoleauth
+    state: stopped
+    enabled: false
+  failed_when: false
+
+# NOTE(mnaser): Remove this task in Train
+- name: Remove unit files for deprecated nova-consoleauth service
+  file:
+    path: "{{ item }}"
+    state: absent
+  with_items:
+    - /etc/systemd/system/nova-consoleauth.service
+    - /etc/tmpfiles.d/openstack-nova-consoleauth.conf
+  register: _remove_consoleauth
+
+# NOTE(mnaser): Remove this task in Train
+- name: Reload systemd for removed units
+  systemd:
+    daemon_reload: yes
+  when:
+    - _remove_consoleauth is changed
+
 - import_tasks: nova_compute.yml
   when:
     - "nova_services['nova-compute']['group'] in group_names"

vars/suse.yml

@@ -36,7 +36,6 @@ nova_devel_distro_packages:
 nova_service_distro_packages:
   - openstack-nova-api
   - openstack-nova-conductor
-  - openstack-nova-consoleauth
   - openstack-nova-placement-api
   - openstack-nova-scheduler
   - python-memcached

vars/ubuntu.yml

@@ -35,7 +35,6 @@ nova_devel_distro_packages:
 nova_service_distro_packages:
   - nova-api
   - nova-conductor
-  - nova-consoleauth
   - nova-placement-api
   - nova-scheduler
   - python-memcache