Move ironic::db data within service template

Change-Id: If0b8fbc783e694f4f744ad848103d40df985fc04

diff --git a/puppet/hieradata/database.yaml b/puppet/hieradata/database.yaml
index 8bf6e9b..9b2ea4f 100644 (file)
--- a/puppet/hieradata/database.yaml
+++ b/puppet/hieradata/database.yaml
@@ -13,14 +13,6 @@ nova::db::mysql_api::allowed_hosts:
   - '%'
   - "%{hiera('mysql_bind_host')}"
 
-# Ironic
-ironic::db::mysql::user: ironic
-ironic::db::mysql::host: "%{hiera('mysql_virtual_ip')}"
-ironic::db::mysql::dbname: ironic
-ironic::db::mysql::allowed_hosts:
-  - '%'
-  - "%{hiera('mysql_bind_host')}"
-
 # Ceilometer
 ceilometer::db::mysql::user: ceilometer
 ceilometer::db::mysql::host: "%{hiera('mysql_virtual_ip')}"

diff --git a/puppet/services/ironic-api.yaml b/puppet/services/ironic-api.yaml
index e1626d5..5ab03fc 100644 (file)
--- a/puppet/services/ironic-api.yaml
+++ b/puppet/services/ironic-api.yaml
@@ -38,6 +38,5 @@ outputs:
             ironic::keystone::auth::internal_url: {get_param: [EndpointMap, IronicInternal, uri]}
             ironic::keystone::auth::admin_url: {get_param: [EndpointMap, IronicAdmin, uri]}
             ironic::keystone::auth::password: {get_param: IronicPassword }
-
       step_config: |
         include ::tripleo::profile::base::ironic::api

diff --git a/puppet/services/ironic-base.yaml b/puppet/services/ironic-base.yaml
index 0eaa53c..df82bb6 100644 (file)
--- a/puppet/services/ironic-base.yaml
+++ b/puppet/services/ironic-base.yaml
@@ -41,7 +41,7 @@ outputs:
     description: Role data for the Ironic role.
     value:
       config_settings:
-        ironic_dsn: &ironic_dsn
+        ironic::database_connection:
           list_join:
             - ''
             - - {get_param: [EndpointMap, MysqlInternal, protocol]}
@@ -51,14 +51,19 @@ 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, MysqlNoBracketsInternal, host]}
+        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

diff --git a/puppet/services/ironic-conductor.yaml b/puppet/services/ironic-conductor.yaml
index 3fb3d9f..26d4e0e 100644 (file)
--- a/puppet/services/ironic-conductor.yaml
+++ b/puppet/services/ironic-conductor.yaml
@@ -31,6 +31,5 @@ outputs:
             # Prevent tftp_server from defaulting to my_ip setting, which is
             # controller VIP, not a real IP.
             ironic::drivers::pxe::tftp_server: {get_input: ironic_api_network}
-
       step_config: |
         include ::tripleo::profile::base::ironic::conductor