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

diff --git a/puppet/services/ironic-base.yaml b/puppet/services/ironic-base.yaml
index 0eaa53cb..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
@@ -40,8 +49,9 @@ outputs:
   role_data:
     description: Role data for the Ironic role.
     value:
+      service_name: ironic_base
       config_settings:
-        ironic_dsn: &ironic_dsn
+        ironic::database_connection:
           list_join:
             - ''
             - - {get_param: [EndpointMap, MysqlInternal, protocol]}
@@ -50,15 +60,17 @@ outputs:
               - '@'
               - {get_param: [EndpointMap, MysqlInternal, host]}
               - '/ironic'
-        ironic::admin_tenant_name: 'service'
-        ironic::database_connection: *ironic_dsn
         ironic::debug: {get_param: Debug}
         ironic::rabbit_userid: {get_param: RabbitUserName}
         ironic::rabbit_password: {get_param: RabbitPassword}
         ironic::rabbit_port: {get_param: RabbitClientPort}
         ironic::rabbit_use_ssl: {get_param: RabbitClientUseSSL}
         ironic::db::mysql::password: {get_param: IronicPassword}
-        ironic::keystone::auth::tenant: 'service'
-
+        ironic::db::mysql::user: ironic
+        ironic::db::mysql::host: {get_param: [EndpointMap, MysqlInternal, host_nobrackets]}
+        ironic::db::mysql::dbname: ironic
+        ironic::db::mysql::allowed_hosts:
+          - '%'
+          - "%{hiera('mysql_bind_host')}"
       step_config: |
         include ::tripleo::profile::base::ironic