Merge "remove loop control when running include_role"

defaults/main.yml

@@ -471,7 +471,11 @@ nova_libvirtd_debug_log_filters: "3:remote 4:event 3:json 3:rpc"
 
 nova_api_metadata_init_overrides: {}
 nova_api_os_compute_init_overrides: {}
-nova_compute_init_overrides: {}
+nova_compute_init_overrides:
+  Unit:
+    ? libvirtd.service
+    ? syslog.target
+    ? network.target
 nova_conductor_init_overrides: {}
 nova_consoleauth_init_overrides: {}
 nova_novncproxy_init_overrides: {}
@@ -511,10 +515,6 @@ nova_services:
     start_order: 6
     execstarts: "{{ nova_bin }}/nova-compute"
     execreloads: "/bin/kill -HUP $MAINPID"
-    after_targets:
-      - libvirtd.service
-      - syslog.target
-      - network.target
   nova-conductor:
     group: nova_conductor
     service_name: nova-conductor

tasks/main.yml

@@ -143,7 +143,6 @@
     name: systemd_service
     private: true
   vars:
-    systemd_after_targets: "{{ service_var.after_targets | default(['syslog.target', 'network.target']) }}"
     systemd_user_name: "{{ nova_system_user_name }}"
     systemd_group_name: "{{ nova_system_group_name }}"
     systemd_tempd_prefix: openstack
@@ -153,16 +152,22 @@
     systemd_BlockIOAccounting: true
     systemd_MemoryAccounting: true
     systemd_TasksAccounting: true
-    systemd_services:
+    systemd_services: |-
-      - service_name: "{{ service_var.service_name }}"
+      {% set services = [] %}
-        enabled: yes
+      {% for service in filtered_nova_services %}
-        state: started
+      {%
-        execstarts: "{{ service_var.execstarts }}"
+        set _ = service.update(
-        execreloads: "{{ service_var.execreloads | default([]) }}"
+          {
-        config_overrides: "{{ service_var.init_config_overrides }}"
+            'enabled': 'yes',
-  with_items: "{{ filtered_nova_services }}"
+            'state': 'started',
-  loop_control:
+            'config_overrides': service.init_config_overrides
-    loop_var: service_var
+          }
+        )
+      %}
+      {%   set _ = service.pop('init_config_overrides') -%}
+      {%   set _ = services.append(service) -%}
+      {% endfor %}
+      {{ services }}
   tags:
     - nova-config
     - systemd-service