Merge "Fix wrong permission on database during mysql_init tasks." into stable/pike

[apex-tripleo-heat-templates.git] / docker / services / iscsid.yaml

diff --git a/docker/services/iscsid.yaml b/docker/services/iscsid.yaml
index f6b348c..da9b1b2 100644 (file)
--- a/docker/services/iscsid.yaml
+++ b/docker/services/iscsid.yaml
@@ -57,6 +57,8 @@ outputs:
     value:
       service_name: {get_attr: [IscsidBase, role_data, service_name]}
       config_settings: {get_attr: [IscsidBase, role_data, config_settings]}
+      logging_source: {get_attr: [IscsidBase, role_data, logging_source]}
+      logging_groups: {get_attr: [IscsidBase, role_data, logging_groups]}
       step_config: &step_config
         {get_attr: [IscsidBase, role_data, step_config]}
       service_config_settings: {get_attr: [IscsidBase, role_data, service_config_settings]}
@@ -109,7 +111,7 @@ outputs:
         - name: Stop and disable iscsid service
           tags: step2
           service: name=iscsid state=stopped enabled=no
-          when: stat_iscsid_service.stat.exists
+          when: (stat_iscsid_service.stat|default('')).exists|default(false)
         - name: stat /lib/systemd/system/iscsid.socket
           tags: step2
           stat: path=/lib/systemd/system/iscsid.socket
@@ -117,5 +119,4 @@ outputs:
         - name: Stop and disable iscsid.socket service
           tags: step2
           service: name=iscsid.socket state=stopped enabled=no
-          when: stat_iscsid_socket.stat.exists
-      metadata_settings: {}
+          when: (stat_iscsid_socket.stat|default('')).exists|default(false)