From a0c94281afe9ee555ca6ae6f30cd1d9ab051dbca Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Tue, 19 Jul 2022 18:00:39 +0900 Subject: [PATCH] Disable direct override using ironic_config ... because it does not allow us to implement these parameters in puppet-ironic. We should NOT use this interface in CI but should use only native puppet parameters. This replaces usage of arbitrary interface by the native puppet parameters. These parameters are not yet implemented because the existing override is causing duplicate definition, but will be added once this change is merged. Change-Id: I1754111c943afc004ef3a3226f662d415f910999 --- .../hieradata-overrides-t-h-t-undercloud.yaml.j2 | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/roles/undercloud-deploy/templates/hieradata-overrides-t-h-t-undercloud.yaml.j2 b/roles/undercloud-deploy/templates/hieradata-overrides-t-h-t-undercloud.yaml.j2 index b39ceb1cf..7a73d9c47 100644 --- a/roles/undercloud-deploy/templates/hieradata-overrides-t-h-t-undercloud.yaml.j2 +++ b/roles/undercloud-deploy/templates/hieradata-overrides-t-h-t-undercloud.yaml.j2 @@ -1,15 +1,8 @@ parameter_defaults: UndercloudExtraConfig: - ironic::config::ironic_config: - disk_utils/image_convert_memory_limit: - value: - 2048 - conductor/heartbeat_interval: - value: - 20 - conductor/heartbeat_timeout: - value: - 120 + ironic::disk_utils::image_convert_memory_limit: 2048 + ironic::conductor::heartbeat_interval: 20 + ironic::conductor::heartbeat_timeout: 120 # Ironic defaults to using `qemu:///system`. When running libvirtd # unprivileged we need to use `qemu:///session`. This allows us to pass