Remove duplicate metadata keys from nova-api.yaml

[apex-tripleo-heat-templates.git] / puppet / services / nova-api.yaml

diff --git a/puppet/services/nova-api.yaml b/puppet/services/nova-api.yaml
index b2ec003..e1e1856 100644 (file)
--- 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,8 +79,8 @@ 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"'
             nova::cron::archive_deleted_rows::destination: '"/dev/null"'
             tripleo.nova_api.firewall_rules:
@@ -100,7 +107,16 @@ outputs:
             # internal_api_uri -> [IP]
             # internal_api_subnet - > IP/CIDR
             nova::api::api_bind_address: {get_param: [ServiceNetMap, NovaApiNetwork]}
-            nova::api::metadata_listen: {get_param: [ServiceNetMap, NovaMetadataNetwork]}
+            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::neutron_metadata_proxy_shared_secret: {get_param: NeutronMetadataProxySharedSecret}
             nova::api::instance_name_template: {get_param: InstanceNameTemplate}
             nova_enable_db_purge: {get_param: NovaEnableDBPurge}