diff options
Diffstat (limited to 'puppet/services')
| -rw-r--r-- | puppet/services/haproxy.yaml | 22 | ||||
| -rw-r--r-- | puppet/services/neutron-api.yaml | 14 | ||||
| -rw-r--r-- | puppet/services/opendaylight-api.yaml | 1 |
3 files changed, 11 insertions, 26 deletions
diff --git a/puppet/services/haproxy.yaml b/puppet/services/haproxy.yaml index df23e6e1..974928c5 100644 --- a/puppet/services/haproxy.yaml +++ b/puppet/services/haproxy.yaml @@ -58,28 +58,6 @@ outputs: tripleo.haproxy.firewall_rules: '107 haproxy stats': dport: 1993 - # TODO(emilien) make it composable to find which services are actually running - tripleo::haproxy::keystone_admin: '"%{hiera(\"keystone_enabled\")}"' - tripleo::haproxy::keystone_public: '"%{hiera(\"keystone_enabled\")}"' - tripleo::haproxy::neutron: '"%{hiera(\"neutron_api_enabled\")}"' - tripleo::haproxy::cinder: '"%{hiera(\"cinder_api_enabled\")}"' - tripleo::haproxy::glance_api: '"%{hiera(\"glance_api_enabled\")}"' - tripleo::haproxy::glance_registry: '"%{hiera(\"glance_registry_enabled\")}"' - tripleo::haproxy::nova_osapi: '"%{hiera(\"nova_api_enabled\")}"' - tripleo::haproxy::nova_metadata: '"%{hiera(\"nova_api_enabled\")}"' - tripleo::haproxy::nova_novncproxy: '"%{hiera(\"nova_vncproxy_enabled\")}"' - tripleo::haproxy::mysql: true - tripleo::haproxy::redis: '"%{hiera(\"redis_enabled\")}"' - tripleo::haproxy::sahara: '"%{hiera(\"sahara_api_enabled\")}"' - tripleo::haproxy::swift_proxy_server: '"%{hiera(\"swift_proxy_enabled\")}"' - tripleo::haproxy::ceilometer: '"%{hiera(\"ceilometer_api_enabled\")}"' - tripleo::haproxy::aodh: '"%{hiera(\"aodh_api_enabled\")}"' - tripleo::haproxy::gnocchi: '"%{hiera(\"gnocchi_api_enabled\")}"' - tripleo::haproxy::heat_api: '"%{hiera(\"heat_api_enabled\")}"' - tripleo::haproxy::heat_cloudwatch: '"%{hiera(\"heat_api_cloudwatch_enabled\")}"' - tripleo::haproxy::heat_cfn: '"%{hiera(\"heat_api_cfn_enabled\")}"' - tripleo::haproxy::horizon: '"%{hiera(\"horizon_enabled\")}"' - tripleo::haproxy::ironic: '"%{hiera(\"ironic_api_enabled\")}"' tripleo::haproxy::haproxy_log_address: {get_param: HAProxySyslogAddress} tripleo::haproxy::haproxy_stats_user: {get_param: HAProxyStatsUser} tripleo::haproxy::haproxy_stats_password: {get_param: HAProxyStatsPassword} diff --git a/puppet/services/neutron-api.yaml b/puppet/services/neutron-api.yaml index da4ec26b..72ae7d9c 100644 --- a/puppet/services/neutron-api.yaml +++ b/puppet/services/neutron-api.yaml @@ -19,9 +19,16 @@ parameters: via parameter_defaults in the resource registry. type: json NeutronWorkers: - default: 0 - description: Number of workers for Neutron service. - type: number + default: '' + description: | + Sets the number of API and RPC workers for the Neutron service. The + default value results in the configuration being left unset and a + system-dependent default will be chosen (usually the number of + processors). Please note that this can result in a large number of + processes and memory consumption on systems with a large core count. On + such systems it is recommended that a non-default value be selected that + matches the load requirements. + type: string NeutronPassword: description: The password for the neutron service and db account, used by neutron agents. type: string @@ -86,6 +93,7 @@ outputs: neutron::keystone::authtoken::auth_uri: {get_param: [EndpointMap, KeystoneInternal, uri] } neutron::keystone::authtoken::auth_url: {get_param: [EndpointMap, KeystoneAdmin, uri_no_suffix]} neutron::server::api_workers: {get_param: NeutronWorkers} + neutron::server::rpc_workers: {get_param: NeutronWorkers} neutron::server::allow_automatic_l3agent_failover: {get_param: NeutronAllowL3AgentFailover} neutron::server::l3_ha: {get_param: NeutronL3HA} neutron::keystone::authtoken::password: {get_param: NeutronPassword} diff --git a/puppet/services/opendaylight-api.yaml b/puppet/services/opendaylight-api.yaml index 64dd7663..d2ee036e 100644 --- a/puppet/services/opendaylight-api.yaml +++ b/puppet/services/opendaylight-api.yaml @@ -75,7 +75,6 @@ outputs: opendaylight::enable_dhcp: {get_param: OpenDaylightEnableDHCP} opendaylight::nb_connection_protocol: {get_param: OpenDaylightConnectionProtocol} opendaylight::odl_bind_ip: {get_param: [ServiceNetMap, OpenDaylightApiNetwork]} - tripleo::haproxy::opendaylight: true step_config: | include tripleo::profile::base::neutron::opendaylight include tripleo::profile::base::neutron::plugins::ovs::opendaylight |