diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2017-08-11 12:02:30 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2017-08-11 12:02:30 +0000 |
| commit | 4e5ba442189d704deaaa1a922bbcaf5c28e9de40 (patch) | |
| tree | c7c856ae7b821d3c49d33f8fd65963cba272ea96 /puppet/role.role.j2.yaml | |
| parent | 13668d83ba1e04b8935c469f7916c45de6f300a8 (diff) | |
| parent | 74e7e674591ec7a9a90ca8ee035576438271d7ff (diff) | |
Merge "Move HAProxy's public TLS logic from controller to service template"
Diffstat (limited to 'puppet/role.role.j2.yaml')
| -rw-r--r-- | puppet/role.role.j2.yaml | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/puppet/role.role.j2.yaml b/puppet/role.role.j2.yaml index 23d8896e..f1abf8dd 100644 --- a/puppet/role.role.j2.yaml +++ b/puppet/role.role.j2.yaml @@ -513,9 +513,6 @@ resources: fqdn_management: {get_attr: [NetHostMap, value, management, fqdn]} fqdn_ctlplane: {get_attr: [NetHostMap, value, ctlplane, fqdn]} fqdn_external: {get_attr: [NetHostMap, value, external, fqdn]} - {%- if 'primary' in role.tags and 'controller' in role.tags %} - tripleo::haproxy::service_certificate: {get_attr: [NodeTLSData, deployed_ssl_certificate_path]} - {%- endif -%} # Resource for site-specific injection of root certificate NodeTLSCAData: |