diff --git a/roles/sso/defaults/main.yml b/roles/sso/defaults/main.yml index d4abf17..81bcaf9 100644 --- a/roles/sso/defaults/main.yml +++ b/roles/sso/defaults/main.yml @@ -7,7 +7,7 @@ - sso71-mysql - sso71-postgresql-persistent - sso71-postgresql - jboss_openshift_application_templates_tag: ose-v1.3.7 + jboss_openshift_application_templates_tag: ose-v1.4.0 jboss_openshift_application_templates_git_repo: https://github.com/jboss-openshift/application-templates.git sso_template: sso71-postgresql-persistent sso_project: sso diff --git a/roles/sso/tasks/main.yml b/roles/sso/tasks/main.yml index 65cd1eb..787b3a7 100644 --- a/roles/sso/tasks/main.yml +++ b/roles/sso/tasks/main.yml @@ -33,6 +33,11 @@ state: directory register: tempfile + - name: Use a local copy of the jboss-openshift/application-templates GIT repo + set_fact: + jboss_openshift_application_templates_git_repo: 'http://{{ offline_git_route }}/{{ jboss_openshift_application_templates_git_repo|basename|regex_replace(''[.]git$'', '''') }}' + when: 'is_offline|default(false)|bool' + - name: Check out the jboss-openshift/application-templates GIT repo git: repo: '{{ jboss_openshift_application_templates_git_repo }}' @@ -48,6 +53,7 @@ - name: Import the Red Hat SSO ImageStream (globally) command: oc import-image -n openshift redhat-sso71-openshift + when: 'not is_offline|default(false)|bool' - name: Get a list of existing projects command: oc get projects -o name