diff options
| author |   Zuul <zuul@review.openstack.org> | 2017-11-05 12:41:26 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2017-11-05 12:41:26 +0000 |
| commit | 5e22400b5ccecc3dcbe019af91263fc0aff73661 (patch) | |
| tree | 9b47536cb2f8558641a32027080e12fae40b5908 | |
| parent | dec1fc107b6e2f76e68b3157f940ac268b825dd6 (diff) | |
| parent | ba80b2bec5bcfc638c670debf11a98bd491ec996 (diff) | |
Merge "Fix iptables rules override bug in clustercheck docker service" into stable/pike
| -rw-r--r-- | docker/services/pacemaker/clustercheck.yaml | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/docker/services/pacemaker/clustercheck.yaml b/docker/services/pacemaker/clustercheck.yaml index b5d128d4..6db8a212 100644 --- a/docker/services/pacemaker/clustercheck.yaml +++ b/docker/services/pacemaker/clustercheck.yaml @@ -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} |