Skip to content

Commit a76ca8d

Browse files
authored
Merge branch 'main' into fix/ansible-deprecations
2 parents 120cdfd + 7579cf4 commit a76ca8d

File tree

1 file changed

+1
-4
lines changed

1 file changed

+1
-4
lines changed

roles/artemis/defaults/main.yml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -345,15 +345,12 @@ artemis_spring_profile_athena: "{% if athena is defined and athena is not none %
345345
artemis_spring_profile_apollon: "{% if apollon_url is defined and apollon_url is not none %},apollon{% endif %}"
346346
artemis_spring_profile_scheduling: "{% if node_id is defined and node_id == 1 %},scheduling{% endif %}"
347347
artemis_spring_profile_docker: "{% if use_docker %},docker{% endif %}"
348-
artemis_spring_profile_iris: "{% if iris is defined and iris is not none %},iris{% endif %}"
349348
artemis_spring_profile_aeolus: "{% if aeolus is defined and aeolus is not none %},aeolus{% endif %}"
350349
artemis_spring_profile_atlas: "{% if atlas is defined and atlas is not none %},atlas{% endif %}"
351-
artemis_spring_profile_lti: "{% if lti.oauth_secret is defined and lti.oauth_secret is not none %},lti{% endif %}"
352350

353351
artemis_spring_profile_core: "{% if artemis_computed_is_core_node %},core{{ artemis_spring_profile_ldap }}{{ artemis_spring_profile_version_control
354352
}}{{ artemis_spring_profile_continuous_integration }}{{ artemis_spring_profile_athena }}{{ artemis_spring_profile_apollon }}{{ artemis_spring_profile_scheduling }}{{ artemis_spring_profile_docker
355-
}}{{ artemis_spring_profile_iris }}{{ artemis_spring_profile_aeolus }}{{ artemis_spring_profile_atlas }}{{ artemis_spring_profile_lti
356-
}}{% endif %}"
353+
}}{{ artemis_spring_profile_aeolus }}{{ artemis_spring_profile_atlas }}{% endif %}"
357354
artemis_spring_profile_buildagent: "{% if continuous_integration.localci is defined and continuous_integration.localci is not none %}{% if continuous_integration.localci.is_build_agent
358355
is defined and continuous_integration.localci.is_build_agent is not none and continuous_integration.localci.is_build_agent %},buildagent{% endif %}{% endif %}"
359356

0 commit comments

Comments
 (0)