Skip to content

Commit

Permalink
Add default EE to fix wait for sync
Browse files Browse the repository at this point in the history
  • Loading branch information
fridim committed Feb 17, 2022
1 parent 7145b6f commit cf0ef22
Showing 1 changed file with 24 additions and 0 deletions.
24 changes: 24 additions & 0 deletions playbooks/service-provision.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,30 @@
file: "{{ catalog_item_params_file }}"
name: catalog_item_params

# RHPDS virtualenvs -> EE automatic creation
- name: Override EE with default_execution_environment if not defined
vars:
ansible_control_plane: >-
{{ vars.catalog_item_params.__meta__.ansible_control_plane.type | default('tower') }}
execution_environment: >-
{{ vars.catalog_item_params.__meta__.deployer.execution_environment | default({}) }}
default_execution_environment:
image: image-registry.apps-dev.open.redhat.com/agnosticd/ee-{{ vars.catalog_item_params.__meta__.deployer.virtualenv | default('ansible2.9-python3.6-2021-11-30') }}
private: true

to_merge:
__meta__:
deployer:
execution_environment: "{{ default_execution_environment }}"
when: >-
ansible_control_plane == 'controller'
and execution_environment | default('', true) == ''
set_fact:
catalog_item_params: "{{ vars.catalog_item_params | combine(to_merge, recursive=True) }}"

- name: Show catalog_item_params
debug:
var: vars.catalog_item_params
Expand Down

0 comments on commit cf0ef22

Please sign in to comment.