diff options
| author |   Ben Nemec <bnemec@redhat.com> | 2016-03-09 17:29:45 -0600 |
|---|---|---|
| committer | Ben Nemec <bnemec@redhat.com> | 2016-03-09 17:29:45 -0600 |
| commit | 46f185fa3bc56f142d8fac07a98645c057df1543 (patch) | |
| tree | baaa4b487b9b843d98e072ca34e2719fbb82691d /puppet | |
| parent | 91c5c470890f1716e70ca50a72ff7431e6fac08a (diff) | |
Wire in HAProxy stats user and password
Change-Id: I26b7a1cd1b7b6520db1df49c60a86c2bb5bce1b0
Depends-On: I12e835964a0370de73e45ef0a8603656ecb02d0c
Depends-On: I8a5844e89bd81a99d5101ab6bce7a8d79e069565
Diffstat (limited to 'puppet')
| -rw-r--r-- | puppet/controller.yaml | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/puppet/controller.yaml b/puppet/controller.yaml index 186dce64..adb55896 100644 --- a/puppet/controller.yaml +++ b/puppet/controller.yaml @@ -225,6 +225,13 @@ parameters: Mount options for Pacemaker mount used as Glance storage. Effective when GlanceFilePcmkManage is true. type: string + HAProxyStatsPassword: + description: Password for HAProxy stats endpoint + type: string + HAProxyStatsUser: + description: User for HAProxy stats endpoint + default: admin + type: string HAProxySyslogAddress: default: /dev/log description: Syslog address where HAproxy will send its log @@ -936,6 +943,8 @@ resources: neutron_enable_l2pop: {get_param: NeutronEnableL2Pop} neutron_enable_isolated_metadata: {get_param: NeutronEnableIsolatedMetadata} haproxy_log_address: {get_param: HAProxySyslogAddress} + haproxy_stats_password: {get_param: HAProxyStatsPassword} + haproxy_stats_user: {get_param: HAProxyStatsUser} heat.watch_server_url: list_join: - '' @@ -1626,6 +1635,8 @@ resources: tripleo::loadbalancer::public_virtual_interface: {get_input: public_virtual_interface} tripleo::loadbalancer::haproxy_log_address: {get_input: haproxy_log_address} tripleo::loadbalancer::service_certificate: {get_attr: [NodeTLSData, deployed_ssl_certificate_path]} + tripleo::loadbalancer::haproxy_stats_user: {get_input: haproxy_stats_user} + tripleo::loadbalancer::haproxy_stats_password: {get_input: haproxy_stats_password} tripleo::packages::enable_install: {get_input: enable_package_install} tripleo::packages::enable_upgrade: {get_input: enable_package_upgrade} |