Merge "Use puppet parameters instead of hieradata key"

deployment/ceilometer/ceilometer-agent-central-container-puppet.yaml

@@ -103,7 +103,7 @@ outputs:
         map_merge:
           - get_attr: [CeilometerServiceBase, role_data, config_settings]
           - ceilometer_redis_password: {get_param: RedisPassword}
-            central_namespace: true
+            tripleo::profile::base::ceilometer::agent::polling::central_namespace: true
       service_config_settings:
         map_merge:
           - get_attr: [CeilometerServiceBase, role_data, service_config_settings]

deployment/ceilometer/ceilometer-agent-compute-container-puppet.yaml

@@ -89,7 +89,7 @@ outputs:
           - get_attr: [CeilometerServiceBase, role_data, config_settings]
           - ceilometer::agent::polling::instance_discovery_method: {get_param: InstanceDiscoveryMethod}
           - ceilometer_redis_password: {get_param: RedisPassword}
-            compute_namespace: true
+            tripleo::profile::base::ceilometer::agent::polling::compute_namespace: true
       service_config_settings:
         get_attr: [CeilometerServiceBase, role_data, service_config_settings]
       # BEGIN DOCKER SETTINGS

deployment/ceilometer/ceilometer-agent-ipmi-container-puppet.yaml

@@ -96,7 +96,7 @@ outputs:
         map_merge:
           - get_attr: [CeilometerServiceBase, role_data, config_settings]
           - ceilometer_redis_password: {get_param: RedisPassword}
-            ipmi_namespace: true
+            tripleo::profile::base::ceilometer::agent::polling::ipmi_namespace: true
       service_config_settings:
         rsyslog:
           tripleo_logging_sources_ceilometer_agent_ipmi:

deployment/keystone/keystone-container-puppet.yaml

@@ -558,7 +558,7 @@ outputs:
               - {get_param: NotificationDriver}
             keystone::notification_format: {get_param: KeystoneNotificationFormat}
             tripleo::profile::base::keystone::extra_notification_topics: {get_param: KeystoneNotificationTopics}
-            keystone_enable_db_purge: {get_param: KeystoneEnableDBPurge}
+            tripleo::profile::base::keystone::manage_db_purge: {get_param: KeystoneEnableDBPurge}
             keystone::cron::trust_flush::ensure: {get_param: KeystoneCronTrustFlushEnsure}
             keystone::cron::trust_flush::minute: {get_param: KeystoneCronTrustFlushMinute}
             keystone::cron::trust_flush::hour: {get_param: KeystoneCronTrustFlushHour}
@@ -613,12 +613,12 @@ outputs:
             - keystone::cache::backend: 'dogpile.cache.memcached'
           - if:
             - {get_param: KeystoneFederationEnable}
-            - keystone_federation_enabled: True
+            - tripleo::profile::base::keystone::keystone_federation_enabled: True
               keystone::federation::trusted_dashboards:
                 get_param: KeystoneTrustedDashboards
           - if:
             - {get_param: KeystoneOpenIdcEnable}
-            - keystone_openidc_enabled: True
+            - tripleo::profile::base::keystone::keystone_openidc_enabled: True
               keystone::federation::openidc::methods:
                 get_param: KeystoneAuthMethods
               keystone::federation::openidc::keystone_url:

deployment/manila/manila-api-container-puppet.yaml

@@ -233,7 +233,7 @@ outputs:
             manila::api::default_share_type: 'default'
             manila::api::policies: {get_param: ManilaApiPolicies}
             manila::api::sync_db: false
-            manila_enabled_share_protocols: {get_param: ManilaEnabledShareProtocols}
+            tripleo::profile::base::manila::api::enabled_share_protocols: {get_param: ManilaEnabledShareProtocols}
             manila::cron::db_purge::minute: {get_param: ManilaCronDbPurgeMinute}
             manila::cron::db_purge::hour: {get_param: ManilaCronDbPurgeHour}
             manila::cron::db_purge::monthday: {get_param: ManilaCronDbPurgeMonthday}

deployment/nova/nova-api-container-puppet.yaml

@@ -395,7 +395,8 @@ outputs:
             nova::api::allow_resize_to_same_host: {get_param: NovaAllowResizeToSameHost}
             nova::api::sync_db: false
             nova::api::sync_db_api: false
-            nova_enable_db_purge: {get_param: NovaEnableDBPurge}
+            # parameters for db purge cron job
+            tripleo::profile::base::nova::api::nova_enable_db_purge: {get_param: NovaEnableDBPurge}
             nova::cron::purge_shadow_tables::minute: {get_param: NovaCronPurgeShadowTablesMinute}
             nova::cron::purge_shadow_tables::hour: {get_param: NovaCronPurgeShadowTablesHour}
             nova::cron::purge_shadow_tables::monthday: {get_param: NovaCronPurgeShadowTablesMonthday}
@@ -407,7 +408,8 @@ outputs:
             nova::cron::purge_shadow_tables::age: {get_param: NovaCronPurgeShadowTablesAge}
             nova::cron::purge_shadow_tables::verbose: {get_param: NovaCronPurgeShadowTablesVerbose}
             nova::cron::purge_shadow_tables::all_cells: {get_param: NovaCronPurgeShadowTablesAllCells}
-            nova_enable_db_archive: {get_param: NovaEnableDBArchive}
+            # parameters for db archive cron job
+            tripleo::profile::base::nova::api::nova_enable_db_archive: {get_param: NovaEnableDBArchive}
             nova::cron::archive_deleted_rows::minute: {get_param: NovaCronArchiveDeleteRowsMinute}
             nova::cron::archive_deleted_rows::hour: {get_param: NovaCronArchiveDeleteRowsHour}
             nova::cron::archive_deleted_rows::monthday: {get_param: NovaCronArchiveDeleteRowsMonthday}