diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2017-06-29 20:12:59 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2017-06-29 20:12:59 +0000 |
| commit | e8d8eae59cf7fac1378ddb6dc78c847abb77c22f (patch) | |
| tree | 2290212e2b6f529824dc499badfba578a892421b /docker/services/pacemaker/haproxy.yaml | |
| parent | 3b7de8a2514cf9b90ee7aec3365bfbf4547175ad (diff) | |
| parent | a474ae82d5f157a48c997fb9df420442bd79dcbe (diff) | |
Merge "Add heat parameter for all of config_volume images"
Diffstat (limited to 'docker/services/pacemaker/haproxy.yaml')
| -rw-r--r-- | docker/services/pacemaker/haproxy.yaml | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/docker/services/pacemaker/haproxy.yaml b/docker/services/pacemaker/haproxy.yaml index 7557afd6..704ffab5 100644 --- a/docker/services/pacemaker/haproxy.yaml +++ b/docker/services/pacemaker/haproxy.yaml @@ -12,6 +12,10 @@ parameters: description: image default: 'centos-binary-haproxy:latest' type: string + DockerHAProxyConfigImage: + description: The container image to use for the haproxy config_volume + default: 'centos-binary-haproxy:latest' + type: string ServiceNetMap: default: {} description: Mapping of service_name -> network name. Typically set @@ -73,7 +77,10 @@ outputs: - "class tripleo::firewall(){}; define tripleo::firewall::rule( $port = undef, $dport = undef, $sport = undef, $proto = undef, $action = undef, $state = undef, $source = undef, $iniface = undef, $chain = undef, $destination = undef, $extras = undef){}" - "['pcmk_bundle', 'pcmk_resource', 'pcmk_property', 'pcmk_constraint', 'pcmk_resource_default'].each |String $val| { noop_resource($val) }" - 'include ::tripleo::profile::pacemaker::haproxy_bundle' - config_image: *haproxy_image + config_image: + list_join: + - '/' + - [ {get_param: DockerNamespace}, {get_param: DockerHAProxyConfigImage} ] kolla_config: /var/lib/kolla/config_files/haproxy.json: command: haproxy -f /etc/haproxy/haproxy.cfg |