diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2016-10-12 16:42:24 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2016-10-12 16:42:24 +0000 |
| commit | 638da9ae2171e19fed8582f8e7e71a9cd12d9a1e (patch) | |
| tree | b162796c42eb1e06d0f38f4af84fbb3d0a75577c | |
| parent | 0baa13790aaf4bb48d1896bb4613a58e81eb25d3 (diff) | |
| parent | 1da253fd8cab7d5d28af4365a3bc1c2368f9b79d (diff) | |
Merge "Add parameters to run nova over httpd"
| -rw-r--r-- | puppet/services/nova-api.yaml | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/puppet/services/nova-api.yaml b/puppet/services/nova-api.yaml index b2ec0038..51488491 100644 --- a/puppet/services/nova-api.yaml +++ b/puppet/services/nova-api.yaml @@ -53,6 +53,13 @@ parameters: path: /var/log/nova/nova-api.log resources: + ApacheServiceBase: + type: ./apache.yaml + properties: + ServiceNetMap: {get_param: ServiceNetMap} + DefaultPasswords: {get_param: DefaultPasswords} + EndpointMap: {get_param: EndpointMap} + NovaBase: type: ./nova-base.yaml properties: @@ -72,6 +79,7 @@ outputs: config_settings: map_merge: - get_attr: [NovaBase, role_data, config_settings] + - get_attr: [ApacheServiceBase, role_data, config_settings] - nova::api::osapi_compute_workers: {get_param: NovaWorkers} nova::api::metadata_workers: {get_param: NovaWorkers} nova::cron::archive_deleted_rows::hour: '"*/12"' @@ -100,6 +108,16 @@ outputs: # internal_api_uri -> [IP] # internal_api_subnet - > IP/CIDR nova::api::api_bind_address: {get_param: [ServiceNetMap, NovaApiNetwork]} + nova::wsgi::apache::ssl: false + nova::wsgi::apache::bind_host: {get_param: [ServiceNetMap, NovaApiNetwork]} + nova::wsgi::apache::servername: + str_replace: + template: + '"%{::fqdn_$NETWORK}"' + params: + $NETWORK: {get_param: [ServiceNetMap, MysqlNetwork]} + nova::wsgi::apache::workers: {get_param: NovaWorkers} + nova::wsgi::apache::bind_host: {get_param: [ServiceNetMap, NovaApiNetwork]} nova::api::metadata_listen: {get_param: [ServiceNetMap, NovaMetadataNetwork]} nova::api::neutron_metadata_proxy_shared_secret: {get_param: NeutronMetadataProxySharedSecret} nova::api::instance_name_template: {get_param: InstanceNameTemplate} |