From 620edb7a2dd5a4ac4e9e672a0798324b302a814d Mon Sep 17 00:00:00 2001 From: Steve Lewis Date: Wed, 7 Sep 2016 12:40:22 -0700 Subject: [PATCH] Require lookup of Gnocchi identity when needed With the dependent fix merged we can expect that when Swift is used as storage for Gnocchi that the Gnocchi identities will exist before the Swift role is executed. Change-Id: I8320731c93f240424cbab50ed75bbf029d168636 Depends-On: I0b6b53d5a4ad7423058c382160cc5009e0b3d866 --- tasks/swift_service_setup.yml | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/tasks/swift_service_setup.yml b/tasks/swift_service_setup.yml index ec9f53df..1f9323ea 100644 --- a/tasks/swift_service_setup.yml +++ b/tasks/swift_service_setup.yml @@ -169,12 +169,6 @@ retries: 5 delay: 10 -# KNOWN ISSUE(stevelle) Never fail. Swift playbook runs before Gnocchi in a -# standard deploy. The project for Gnocchi will not have been created yet. -# There is a known issue in project / user / role lifecycles that causes a -# circular service dependency here. The Swift playbook must be run a second -# time, after the Gnocchi playbook runs, when it uses Swift storage as a -# workaround. - name: Get Gnocchi project id keystone: command: get_project @@ -185,7 +179,9 @@ login_project_name: "{{ keystone_admin_tenant_name }}" insecure: "{{ keystone_service_adminuri_insecure }}" register: get_gnocchi_project - failed_when: False + until: get_gnocchi_project|success + retries: 5 + delay: 10 when: - swift_gnocchi_enabled | bool - swift_gnocchi_service_project_id is not defined