openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Move the multipathd services into deployment 

Change-Id: Ifc6f8cadea54b7f761b3608b50d4004582e44616
Related-Blueprint: services-yaml-flattening
This commit is contained in:
Dan Prince 2019-01-29 08:13:40 -05:00
parent 9c887d2340
commit bcd4383441
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
docker/services/multipathd.yaml → deployment/multipathd/multipathd-container.yaml
View File

@ -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:

2
overcloud-resource-registry-puppet.j2.yaml
View File

@ -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