From bcd4383441d0a5a7bdfbaa89f3708c48f8921419 Mon Sep 17 00:00:00 2001
From: Dan Prince <dprince@redhat.com>
Date: Tue, 29 Jan 2019 08:13:40 -0500
Subject: [PATCH] Move the multipathd services into deployment
Change-Id: Ifc6f8cadea54b7f761b3608b50d4004582e44616
Related-Blueprint: services-yaml-flattening
---
.../multipathd/multipathd-container.yaml | 3 +--
overcloud-resource-registry-puppet.j2.yaml | 2 +-
2 files changed, 2 insertions(+), 3 deletions(-)
rename docker/services/multipathd.yaml => deployment/multipathd/multipathd-container.yaml (98%)
diff --git a/docker/services/multipathd.yaml b/deployment/multipathd/multipathd-container.yaml
similarity index 98%
rename from docker/services/multipathd.yaml
rename to deployment/multipathd/multipathd-container.yaml
index 711bdb0ee9..fa5d2d4244 100644
--- a/docker/services/multipathd.yaml
+++ b/deployment/multipathd/multipathd-container.yaml
@@ -40,7 +40,7 @@ parameters:
resources:
ContainersCommon:
- type: ./containers-common.yaml
+ type: ../../docker/services/containers-common.yaml
outputs:
role_data:
@@ -52,7 +52,6 @@ outputs:
# BEGIN DOCKER SETTINGS
puppet_config:
config_volume: multipathd
- #puppet_tags: file
step_config: ''
config_image: {get_param: DockerMultipathdConfigImage}
kolla_config:
diff --git a/overcloud-resource-registry-puppet.j2.yaml b/overcloud-resource-registry-puppet.j2.yaml
index 51085105f6..fc48673b4a 100644
--- a/overcloud-resource-registry-puppet.j2.yaml
+++ b/overcloud-resource-registry-puppet.j2.yaml
@@ -332,7 +332,7 @@ resource_registry:
# FIXME(bogdando): can not be switched yet due to puppet-base issues
# see https://review.openstack.org/#/c/563443
OS::TripleO::Docker::NeutronMl2PluginBase: puppet/services/neutron-plugin-ml2.yaml
- OS::TripleO::Services::Multipathd: docker/services/multipathd.yaml
+ OS::TripleO::Services::Multipathd: deployment/multipathd/multipathd-container.yaml
# Logging
OS::TripleO::Services::Logging::BarbicanApi: docker/services/logging/files/barbican-api.yaml