diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2016-03-21 16:58:05 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2016-03-21 16:58:05 +0000 |
| commit | 60fb98f274a0fdcef6c24bf98a8e36ea8ab4ea5f (patch) | |
| tree | f07a4978ee0b1a606dcd52f20ae5684f08c37aab | |
| parent | 53e2f2dea7d6c7d3e623082141b6fedbc301c276 (diff) | |
| parent | 46f185fa3bc56f142d8fac07a98645c057df1543 (diff) | |
Merge "Wire in HAProxy stats user and password"
| -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 14b70484..28aac934 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 @@ -939,6 +946,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: - '' @@ -1629,6 +1638,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} |