openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Merge "Fix iptables rules override bug in clustercheck docker service"

This commit is contained in:
Zuul 2017-11-02 19:08:02 +00:00 committed by Gerrit Code Review
parent e9fe60848a 3df6a4204a
commit 274a38d15f
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
docker/services/pacemaker/clustercheck.yaml
View File

@ -44,8 +44,11 @@ resources:
ContainersCommon:
type: ../containers-common.yaml
# We import from the corresponding docker service because otherwise we risk
# rewriting the tripleo.mysql.firewall_rules key with the baremetal firewall
# rules (see LP#1728918)
MysqlPuppetBase:
type: ../../../puppet/services/pacemaker/database/mysql.yaml
type: ../../../docker/services/pacemaker/database/mysql.yaml
properties:
EndpointMap: {get_param: EndpointMap}
ServiceData: {get_param: ServiceData}