Merge "Fixing resources path in OpenDaylight"

[apex-tripleo-heat-templates.git] / puppet / services / ironic-base.yaml

diff --git a/puppet/services/ironic-base.yaml b/puppet/services/ironic-base.yaml
index ea7e7ee..0ff393c 100644 (file)
--- 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
@@ -56,12 +65,5 @@ outputs:
         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::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