X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=puppet%2Fservices%2Fnova-api.yaml;h=143c061996a1b107430c801dce3962583e8cd7e8;hb=6c537d2005b8cb5b25f63722376fca08471987ac;hp=045a861437c4fc604a9aaf9790d7afd071242e69;hpb=569e73ff758d58d4f3ece707b259f0b2926dcf9c;p=apex-tripleo-heat-templates.git

diff --git a/puppet/services/nova-api.yaml b/puppet/services/nova-api.yaml
index 045a8614..143c0619 100644
--- a/puppet/services/nova-api.yaml
+++ b/puppet/services/nova-api.yaml
@@ -4,6 +4,15 @@ description: >
   OpenStack Nova API service configured with Puppet
 
 parameters:
+  ServiceNetMap:
+    default: {}
+    description: Mapping of service_name -> network name. Typically set
+                 via parameter_defaults in the resource registry.  This
+                 mapping overrides those in ServiceNetMapDefaults.
+    type: json
+  DefaultPasswords:
+    default: {}
+    type: json
   EndpointMap:
     default: {}
     description: Mapping of service endpoint -> protocol. Typically set
@@ -13,11 +22,21 @@ parameters:
     default: 0
     description: Number of workers for Nova API service.
     type: number
+  NovaPassword:
+    description: The password for the nova service and db account, used by nova-api.
+    type: string
+    hidden: true
+  KeystoneRegion:
+    type: string
+    default: 'regionOne'
+    description: Keystone region for endpoint
 
 resources:
   NovaBase:
     type: ./nova-base.yaml
     properties:
+      ServiceNetMap: {get_param: ServiceNetMap}
+      DefaultPasswords: {get_param: DefaultPasswords}
       EndpointMap: {get_param: EndpointMap}
 
 outputs:
@@ -47,5 +66,11 @@ outputs:
             nova::api::default_floating_pool: 'public'
             nova::api::sync_db_api: true
             nova::api::enable_proxy_headers_parsing: true
+            nova::keystone::auth::tenant: 'service'
+            nova::keystone::auth::public_url: {get_param: [EndpointMap, NovaPublic, uri]}
+            nova::keystone::auth::internal_url: {get_param: [EndpointMap, NovaInternal, uri]}
+            nova::keystone::auth::admin_url: {get_param: [EndpointMap, NovaAdmin, uri]}
+            nova::keystone::auth::password: {get_param: NovaPassword}
+            nova::keystone::auth::region: {get_param: KeystoneRegion}
       step_config: |
         include tripleo::profile::base::nova::api