Merge "Fix issues with nova distro install on Ubuntu"

openstack · Nov 5, 2018 · b1d5e97 · b1d5e97
2 parents 1767193 + 914fd48
commit b1d5e97
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/defaults/main.yml b/defaults/main.yml
@@ -495,7 +495,7 @@ nova_services:
   nova-api-os-compute:
     group: nova_api_os_compute
     service_name: nova-api-os-compute
-    init_config_overrides: "{{ nova_api_os_compute_init_overrides }}"
+    init_config_overrides: "{{ {'Install': {'Alias': 'nova-api.service'}} | combine(nova_api_os_compute_init_overrides) }}"
     start_order: 4
     execstarts: "{{ nova_uwsgi_bin }}/uwsgi --autoload --ini /etc/uwsgi/nova-api-os-compute.ini"
     execreloads: "{{ nova_uwsgi_bin }}/uwsgi --reload /var/run/nova-api-os-compute/nova-api-os-compute.pid"
@@ -544,7 +544,7 @@ nova_services:
   nova-spicehtml5proxy:
     group: nova_console
     service_name: nova-spicehtml5proxy
-    init_config_overrides: "{{ nova_spicehtml5proxy_init_overrides }}"
+    init_config_overrides: "{{ {'Install': {'Alias': 'nova-spiceproxy.service'}} | combine(nova_spicehtml5proxy_init_overrides) }}"
     condition: "{{ nova_console_type == 'spice' }}"
     start_order: 5
     execstarts: "{{ nova_bin }}/nova-spicehtml5proxy"

diff --git a/tasks/nova_post_install.yml b/tasks/nova_post_install.yml
@@ -77,6 +77,17 @@
     - nova-config
     - nova-post-install
 
+- name: Remove nova-compute config
+  file:
+    path: /etc/nova/nova-compute.conf
+    state: absent
+  notify:
+    - Manage LB
+    - Restart nova services
+  tags:
+    - nova-config
+    - nova-post-install
+
 - name: Drop sudoers file
   template:
     src: "sudoers.j2"