diff options
Diffstat (limited to 'puppet')
| -rw-r--r-- | puppet/controller-role.yaml | 7 | ||||
| -rw-r--r-- | puppet/services/ceph-mon.yaml | 4 | ||||
| -rw-r--r-- | puppet/services/haproxy.yaml | 5 | ||||
| -rw-r--r-- | puppet/services/neutron-ovs-agent.yaml | 3 | ||||
| -rw-r--r-- | puppet/services/qdr.yaml | 6 |
5 files changed, 11 insertions, 14 deletions
diff --git a/puppet/controller-role.yaml b/puppet/controller-role.yaml index cdc2ec68..933b5e60 100644 --- a/puppet/controller-role.yaml +++ b/puppet/controller-role.yaml @@ -27,10 +27,6 @@ parameters: default: '' description: Set to True to enable debugging on all services. type: string - EnableLoadBalancer: - default: true - description: Whether to deploy a LoadBalancer on the Controller - type: boolean ExtraConfig: default: {} description: | @@ -525,7 +521,6 @@ resources: config: {get_resource: ControllerConfig} server: {get_resource: Controller} input_values: - enable_load_balancer: {get_param: EnableLoadBalancer} enable_package_upgrade: {get_attr: [UpdateDeployment, update_managed_packages]} # Map heat metadata into hiera datafiles @@ -567,8 +562,6 @@ resources: - {get_param: ControllerExtraConfig} extraconfig: {get_param: ExtraConfig} controller: - enable_load_balancer: {get_input: enable_load_balancer} - # Misc tripleo::haproxy::service_certificate: {get_attr: [NodeTLSData, deployed_ssl_certificate_path]} tripleo::packages::enable_upgrade: {get_input: enable_package_upgrade} diff --git a/puppet/services/ceph-mon.yaml b/puppet/services/ceph-mon.yaml index 28552301..cbeef6c5 100644 --- a/puppet/services/ceph-mon.yaml +++ b/puppet/services/ceph-mon.yaml @@ -69,11 +69,11 @@ parameters: type: json CephValidationRetries: type: number - default: 5 + default: 40 description: Number of retry attempts for Ceph validation CephValidationDelay: type: number - default: 10 + default: 30 description: Interval (in seconds) in between validation checks MonitoringSubscriptionCephMon: default: 'overcloud-ceph-mon' diff --git a/puppet/services/haproxy.yaml b/puppet/services/haproxy.yaml index 5bdc3b88..35dcc196 100644 --- a/puppet/services/haproxy.yaml +++ b/puppet/services/haproxy.yaml @@ -26,6 +26,10 @@ parameters: description: Mapping of service endpoint -> protocol. Typically set via parameter_defaults in the resource registry. type: json + EnableLoadBalancer: + default: true + description: Whether to deploy a LoadBalancer, set to false when an external load balancer is used. + type: boolean HAProxyStatsPassword: description: Password for HAProxy stats endpoint hidden: true @@ -100,6 +104,7 @@ outputs: tripleo::haproxy::ca_bundle: {get_param: InternalTLSCAFile} tripleo::haproxy::crl_file: {get_param: InternalTLSCRLPEMFile} tripleo::haproxy::haproxy_stats: {get_param: HAProxyStatsEnabled} + enable_load_balancer: {get_param: EnableLoadBalancer} tripleo::profile::base::haproxy::certificates_specs: map_merge: - get_attr: [HAProxyPublicTLS, role_data, certificates_specs] diff --git a/puppet/services/neutron-ovs-agent.yaml b/puppet/services/neutron-ovs-agent.yaml index 4493721c..2c23cf55 100644 --- a/puppet/services/neutron-ovs-agent.yaml +++ b/puppet/services/neutron-ovs-agent.yaml @@ -53,8 +53,7 @@ parameters: type: comma_delimited_list NeutronEnableDVR: default: False - description: | - Enable support for distributed routing in the OVS Agent. + description: Enable Neutron DVR. type: boolean NeutronEnableARPResponder: default: false diff --git a/puppet/services/qdr.yaml b/puppet/services/qdr.yaml index 0659a945..433556f3 100644 --- a/puppet/services/qdr.yaml +++ b/puppet/services/qdr.yaml @@ -28,14 +28,14 @@ parameters: type: json RabbitUserName: default: guest - description: The username for Qdr + description: The username for RabbitMQ type: string RabbitPassword: - description: The password for Qdr + description: The password for RabbitMQ type: string hidden: true RabbitClientPort: - description: Listening port for Qdr + description: Set rabbit subscriber port, change this if using SSL default: 5672 type: number MonitoringSubscriptionQdr: |