From 52649405a2e050c2ad36f5ac454f4955cf6481ba Mon Sep 17 00:00:00 2001 From: Juan Antonio Osorio Robles Date: Tue, 1 Aug 2017 08:42:33 +0300 Subject: Remove empty metadata_settings from iscsid and multipathd templates metadata_settings is meant to have a specific format or be completely absent. Unfortunately the hook [1] doesn't an empty value for this. So we remove it as an easy fix before figuring out how to add such a functionality to the hook. [1] https://github.com/openstack/tripleo-heat-templates/blob/master/extraconfig/nova_metadata/krb-service-principals.yaml Co-Authored-By: Thomas Herve Change-Id: Ieac62a8076e421b5c4843a3cbe1c8fa9e3825b38 --- docker/services/iscsid.yaml | 1 - docker/services/multipathd.yaml | 1 - 2 files changed, 2 deletions(-) diff --git a/docker/services/iscsid.yaml b/docker/services/iscsid.yaml index f6b348c7..80519800 100644 --- a/docker/services/iscsid.yaml +++ b/docker/services/iscsid.yaml @@ -118,4 +118,3 @@ outputs: tags: step2 service: name=iscsid.socket state=stopped enabled=no when: stat_iscsid_socket.stat.exists - metadata_settings: {} diff --git a/docker/services/multipathd.yaml b/docker/services/multipathd.yaml index a0c02f30..fc749f37 100644 --- a/docker/services/multipathd.yaml +++ b/docker/services/multipathd.yaml @@ -90,4 +90,3 @@ outputs: - name: Stop and disable multipathd service tags: step2 service: name=multipathd state=stopped enabled=no - metadata_settings: {} -- cgit 1.2.3-korg