X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=puppet%2Fservices%2Fironic-base.yaml;h=2f242da8d614b7cf98fe2e2ae6f8f2b9119b7264;hb=43476e235ce11359a5327f9dfca671b8ffeb5ab9;hp=41d2234a5960c310563e448d7b920f3428b52541;hpb=a45ea6107df25f1444142a1945717c90180e2700;p=apex-tripleo-heat-templates.git

diff --git a/puppet/services/ironic-base.yaml b/puppet/services/ironic-base.yaml
index 41d2234a..2f242da8 100644
--- a/puppet/services/ironic-base.yaml
+++ b/puppet/services/ironic-base.yaml
@@ -4,6 +4,15 @@ description: >
   OpenStack Ironic services 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
@@ -51,7 +60,6 @@ outputs:
               - '@'
               - {get_param: [EndpointMap, MysqlInternal, host]}
               - '/ironic'
-        ironic::admin_tenant_name: 'service'
         ironic::debug: {get_param: Debug}
         ironic::rabbit_userid: {get_param: RabbitUserName}
         ironic::rabbit_password: {get_param: RabbitPassword}
@@ -59,12 +67,10 @@ outputs:
         ironic::rabbit_use_ssl: {get_param: RabbitClientUseSSL}
         ironic::db::mysql::password: {get_param: IronicPassword}
         ironic::db::mysql::user: ironic
-        ironic::db::mysql::host: {get_param: [EndpointMap, MysqlNoBracketsInternal, host]}
+        ironic::db::mysql::host: {get_param: [EndpointMap, MysqlInternal, host_nobrackets]}
         ironic::db::mysql::dbname: ironic
         ironic::db::mysql::allowed_hosts:
           - '%'
           - "%{hiera('mysql_bind_host')}"
-
-        ironic::keystone::auth::tenant: 'service'
       step_config: |
         include ::tripleo::profile::base::ironic