Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Custom App install fix #773

Merged
merged 2 commits into from
Dec 17, 2024
Merged

Custom App install fix #773

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3a09598
no need to validate version
Dec 17, 2024
c402a00
update dt_operator_release to v1.4.0 (#771)
IgnacioGoldman Dec 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion user-skel/ansible_collections/ace_box/ace_box/roles/dt-operator/defaults/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

---
operator_mode: "applicationMonitoring" # default & prefered deployment option
dt_operator_release: "1.3.0-rc.0" # operator release should be linked with the right operator mode
dt_operator_release: "1.4.0" # operator release should be linked with the right operator mode
log_monitoring: "off"

# operator_mode: "classicFullStack"
Expand Down
31 changes: 16 additions & 15 deletions ...skel/ansible_collections/ace_box/ace_box/roles/dt-platform/tasks/install-app-artifact.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,22 +37,22 @@
- set_fact:
dt_oauth_access_token: "{{ auth_response_raw.json.access_token }}"

- include_role:
name: dt-platform
tasks_from: validate-app-version
vars:
dt_environment_url_gen3: "{{ extra_vars.dt_environment_url_gen3 }}"
dt_oauth_sso_endpoint: "{{ extra_vars.dt_oauth_sso_endpoint }}"
dt_oauth_client_id: "{{ extra_vars.dt_oauth_client_id }}"
dt_oauth_client_secret: "{{ extra_vars.dt_oauth_client_secret }}"
dt_oauth_account_urn: "{{ extra_vars.dt_oauth_account_urn }}"
# - include_role:
# name: dt-platform
# tasks_from: validate-app-version
# vars:
# dt_environment_url_gen3: "{{ extra_vars.dt_environment_url_gen3 }}"
# dt_oauth_sso_endpoint: "{{ extra_vars.dt_oauth_sso_endpoint }}"
# dt_oauth_client_id: "{{ extra_vars.dt_oauth_client_id }}"
# dt_oauth_client_secret: "{{ extra_vars.dt_oauth_client_secret }}"
# dt_oauth_account_urn: "{{ extra_vars.dt_oauth_account_urn }}"

- block:
- debug:
msg: "{{ dt_app_version }} of {{ dt_app_id }} is installed in target environment already. Skipping installation."
- set_fact:
dt_app_id: "{{ dt_app_id }}"
when: dt_app_version is defined and dt_app_version is not none
# - block:
# - debug:
# msg: "{{ dt_app_version }} of {{ dt_app_id }} is installed in target environment already. Skipping installation."
# - set_fact:
# dt_app_id: "{{ dt_app_id }}"
# when: dt_app_version is defined and dt_app_version is not none

- block:
- name: "Install app {{ dt_app_id }}"
Expand All @@ -65,6 +65,7 @@
Authorization: "Bearer {{ dt_oauth_access_token }}"
src: "{{ dt_app_artifact_path }}"
register: post_apps_response_raw

- set_fact:
dt_app_id: "{{ post_apps_response_raw.json.id }}"
when: dt_app_version is not defined or dt_app_version is none
Loading