From cea554ee211fd3b5bada1d768d75e10cf328006b Mon Sep 17 00:00:00 2001 From: Giulio Fidente Date: Fri, 20 Apr 2018 18:42:41 +0200 Subject: [PATCH] Revert "Fixes ceph-external docker service name" This reverts commit b02740533db5bbb05331f127dc22866cc870f15b. The CephExternal service is managed like CephClient by ceph-ansible, except for the additional parameter we need to pass to explicitly list the MONs. Change-Id: Icb56b4dffb5c5d813239cb5077b1e3a4ae8f21d1 Closes-Bug: #1765788 --- docker/services/ceph-ansible/ceph-external.yaml | 2 +- .../notes/fix-ceph-external-name-7bf64c840d5769f6.yaml | 5 ----- 2 files changed, 1 insertion(+), 6 deletions(-) delete mode 100644 releasenotes/notes/fix-ceph-external-name-7bf64c840d5769f6.yaml diff --git a/docker/services/ceph-ansible/ceph-external.yaml b/docker/services/ceph-ansible/ceph-external.yaml index 95b05fc02b..269bd8bfba 100644 --- a/docker/services/ceph-ansible/ceph-external.yaml +++ b/docker/services/ceph-ansible/ceph-external.yaml @@ -58,7 +58,7 @@ outputs: role_data: description: Role data for the Ceph External service. value: - service_name: ceph_external + service_name: ceph_client upgrade_tasks: [] puppet_config: config_image: '' diff --git a/releasenotes/notes/fix-ceph-external-name-7bf64c840d5769f6.yaml b/releasenotes/notes/fix-ceph-external-name-7bf64c840d5769f6.yaml deleted file mode 100644 index d8ff90043f..0000000000 --- a/releasenotes/notes/fix-ceph-external-name-7bf64c840d5769f6.yaml +++ /dev/null @@ -1,5 +0,0 @@ ---- -fixes: - - | - Corrects the service_name for the ceph-external service. - See https://bugs.launchpad.net/tripleo/+bug/1761531