From cadc1073849be0c3e0b61564f1545880cc37fff1 Mon Sep 17 00:00:00 2001 From: Leif Madsen Date: Wed, 24 May 2017 13:27:24 -0400 Subject: [PATCH] Add `when` to skip os_client_config in noauth mode When noauth_mode=true, the os_client_config Ansible module will still execute and then fails due to a missing clouds.yaml file (which is only generated when keystone is enabled and installed). This change will skip over the os_client_config module when noauth_mode is set to true. Change-Id: Iff3f33fe5e1f7d952c982fa377af0ff415ec2831 Closes-Bug: #1693309 Signed-off-by: Leif Madsen --- .../tasks/update_facts_from_ironic.yaml | 1 + playbooks/roles/bifrost-deploy-nodes-dynamic/tasks/main.yml | 1 + playbooks/roles/bifrost-unprovision-node-dynamic/tasks/main.yml | 1 + playbooks/roles/ironic-delete-dynamic/tasks/main.yml | 1 + playbooks/roles/ironic-enroll-dynamic/tasks/main.yml | 1 + playbooks/roles/ironic-inspect-node/tasks/main.yml | 1 + 6 files changed, 6 insertions(+) diff --git a/playbooks/roles/bifrost-configdrives-dynamic/tasks/update_facts_from_ironic.yaml b/playbooks/roles/bifrost-configdrives-dynamic/tasks/update_facts_from_ironic.yaml index 01e0ccd0e..c2b67d6b0 100644 --- a/playbooks/roles/bifrost-configdrives-dynamic/tasks/update_facts_from_ironic.yaml +++ b/playbooks/roles/bifrost-configdrives-dynamic/tasks/update_facts_from_ironic.yaml @@ -21,6 +21,7 @@ - name: "Execute os_client_config to collect facts" os_client_config: no_log: yes + when: noauth_mode is defined and noauth_mode | bool == false # NOTE(TheJulia): The first record returned by os_client_config # is utilized as the default. A user can still define the parameters diff --git a/playbooks/roles/bifrost-deploy-nodes-dynamic/tasks/main.yml b/playbooks/roles/bifrost-deploy-nodes-dynamic/tasks/main.yml index c4339413b..456b066da 100644 --- a/playbooks/roles/bifrost-deploy-nodes-dynamic/tasks/main.yml +++ b/playbooks/roles/bifrost-deploy-nodes-dynamic/tasks/main.yml @@ -29,6 +29,7 @@ - name: "Execute os_client_config to collect facts" os_client_config: no_log: yes + when: noauth_mode is defined and noauth_mode | bool == false # NOTE(TheJulia): The first record returned by os_client_config # is utilized as the default. A user can still define the parameters diff --git a/playbooks/roles/bifrost-unprovision-node-dynamic/tasks/main.yml b/playbooks/roles/bifrost-unprovision-node-dynamic/tasks/main.yml index f9c19ce39..39acb3d14 100644 --- a/playbooks/roles/bifrost-unprovision-node-dynamic/tasks/main.yml +++ b/playbooks/roles/bifrost-unprovision-node-dynamic/tasks/main.yml @@ -31,6 +31,7 @@ auth_type: "{{ openstack.clouds[0].auth_type }}" when: auth is undefined no_log: yes + when: noauth_mode is defined and noauth_mode | bool == false - name: "Unprovision node" os_ironic_node: diff --git a/playbooks/roles/ironic-delete-dynamic/tasks/main.yml b/playbooks/roles/ironic-delete-dynamic/tasks/main.yml index b7f08ec77..29fa7e2d9 100644 --- a/playbooks/roles/ironic-delete-dynamic/tasks/main.yml +++ b/playbooks/roles/ironic-delete-dynamic/tasks/main.yml @@ -21,6 +21,7 @@ - name: "Execute os_client_config to collect facts" os_client_config: no_log: yes + when: noauth_mode is defined and noauth_mode | bool == false # NOTE(TheJulia): The first record returned by os_client_config # is utilized as the default. A user can still define the parameters diff --git a/playbooks/roles/ironic-enroll-dynamic/tasks/main.yml b/playbooks/roles/ironic-enroll-dynamic/tasks/main.yml index b528365c6..3051bf60e 100644 --- a/playbooks/roles/ironic-enroll-dynamic/tasks/main.yml +++ b/playbooks/roles/ironic-enroll-dynamic/tasks/main.yml @@ -24,6 +24,7 @@ - name: "Execute os_client_config to collect facts" os_client_config: no_log: yes + when: noauth_mode is defined and noauth_mode | bool == false # NOTE(TheJulia): The first record returned by os_client_config # is utilized as the default. A user can still define the parameters diff --git a/playbooks/roles/ironic-inspect-node/tasks/main.yml b/playbooks/roles/ironic-inspect-node/tasks/main.yml index 029ac9420..c523696d9 100644 --- a/playbooks/roles/ironic-inspect-node/tasks/main.yml +++ b/playbooks/roles/ironic-inspect-node/tasks/main.yml @@ -24,6 +24,7 @@ - name: "Execute os_client_config to collect facts" os_client_config: no_log: yes + when: noauth_mode is defined and noauth_mode | bool == false # NOTE(TheJulia): The first record returned by os_client_config # is utilized as the default. A user can still define the parameters