From 5af7e7f4b9875508dc6ce0574efb6a70f1173ae1 Mon Sep 17 00:00:00 2001 From: Jeremy Kimber Date: Fri, 15 Apr 2022 13:04:47 -0700 Subject: [PATCH] Ensure custom control plane EE is defined prior to creation of application credentials (#873) Co-authored-by: Jeremy Kimber --- .../tasks/resources_configuration.yml | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/roles/installer/tasks/resources_configuration.yml b/roles/installer/tasks/resources_configuration.yml index 3230a51b..0a3be76c 100644 --- a/roles/installer/tasks/resources_configuration.yml +++ b/roles/installer/tasks/resources_configuration.yml @@ -17,6 +17,16 @@ set_fact: tower_pod_name: "{{ tower_pods['resources'][0]['metadata']['name'] | default('') }}" +- name: Set user provided control plane ee image + set_fact: + _custom_control_plane_ee_image: "{{ control_plane_ee_image }}" + when: + - control_plane_ee_image | default([]) | length + +- name: Set Control Plane EE image URL + set_fact: + _control_plane_ee_image: "{{ _custom_control_plane_ee_image | default(lookup('env', 'RELATED_IMAGE_CONTROL_PLANE_EE')) | default(_control_plane_ee_image, true) }}" + - name: Apply Resources k8s: apply: yes @@ -62,16 +72,6 @@ set_fact: _redis_image: "{{ _custom_redis_image | default(lookup('env', 'RELATED_IMAGE_AWX_REDIS')) | default(_default_redis_image, true) }}" -- name: Set user provided control plane ee image - set_fact: - _custom_control_plane_ee_image: "{{ control_plane_ee_image }}" - when: - - control_plane_ee_image | default([]) | length - -- name: Set Control Plane EE image URL - set_fact: - _control_plane_ee_image: "{{ _custom_control_plane_ee_image | default(lookup('env', 'RELATED_IMAGE_CONTROL_PLANE_EE')) | default(_control_plane_ee_image, true) }}" - - name: Apply deployment resources k8s: apply: yes