From 67686a3b1361fd52b6fd0304e225fef40bd1235a Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Wed, 10 Nov 2021 01:01:37 +0900 Subject: [PATCH] Keystone: Remove unused container_puppet_tasks This was introduced to manage keystone resources (users, projects and so on) by puppet but now these resources are managed by ansible. Conflicts: deployment/keystone/keystone-container-puppet.yaml Resolved conflict caused by e329ca915ebf9e9a061c5d9b9141ed7a22fcda37 . Change-Id: I9e76f21e41e2891f959cbf41b89cba07b2e67632 (cherry picked from commit 925e2db462c76b01f46611b8052e127d9d61b408) (cherry picked from commit 48d547ce7c26a56fffd1f73e9548c5b263dae8d4) (cherry picked from commit 432968ba612a42673a0bec47f0988c66daaa8dc6) --- deployment/keystone/keystone-container-puppet.yaml | 7 ------- 1 file changed, 7 deletions(-) diff --git a/deployment/keystone/keystone-container-puppet.yaml b/deployment/keystone/keystone-container-puppet.yaml index 0a47f0b780..902051da0f 100644 --- a/deployment/keystone/keystone-container-puppet.yaml +++ b/deployment/keystone/keystone-container-puppet.yaml @@ -833,13 +833,6 @@ outputs: - container_cli == 'podman' - not container_healthcheck_disabled - step|int == 4 - container_puppet_tasks: - # Keystone endpoint creation occurs only on single node - step_3: - config_volume: 'keystone_init_tasks' - puppet_tags: 'keystone_config' - step_config: 'include tripleo::profile::base::keystone' - config_image: *keystone_config_image host_prep_tasks: {get_attr: [KeystoneLogging, host_prep_tasks]} metadata_settings: get_attr: [ApacheServiceBase, role_data, metadata_settings]