diff options
| author | Brenton Leanhardt <bleanhar@redhat.com> | 2016-03-07 13:35:46 -0500 |
|---|---|---|
| committer | Brenton Leanhardt <bleanhar@redhat.com> | 2016-03-07 15:10:33 -0500 |
| commit | 4b394fc566333d4d9f4bc789b03b9a68c22bb028 (patch) | |
| tree | 860179d0fa85a68e624c8d131b50b5b8cd31fae3 /roles/openshift_master/vars/main.yml | |
| parent | b0ebc4302507ca9464837281ea9cf4aeb5ef4e90 (diff) | |
| download | openshift-4b394fc566333d4d9f4bc789b03b9a68c22bb028.tar.gz openshift-4b394fc566333d4d9f4bc789b03b9a68c22bb028.tar.bz2 openshift-4b394fc566333d4d9f4bc789b03b9a68c22bb028.tar.xz openshift-4b394fc566333d4d9f4bc789b03b9a68c22bb028.zip | |
Support openshift_image_tag
This is the containerized openshift_pkg_version equivalent. Originally I was
hoping to reuse openshift_pkg_version for containerized installs but the fact
that it's very coupled to yum made that pretty ugly.
However, I did opt to rely on the previously existing 'openshift_version'
variable. Containerized and RPM installs can both use that variable and it
will be set appropriately if either openshift_pkg_version or
openshift_image_tag are set. I suspect someday containerized installs will be
the only option and I didn't can to have thinkgs like openshift_pkg_version and
openshift_image_tag in the playbooks anymore the necessary.
Diffstat (limited to 'roles/openshift_master/vars/main.yml')
| -rw-r--r-- | roles/openshift_master/vars/main.yml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/roles/openshift_master/vars/main.yml b/roles/openshift_master/vars/main.yml index fe88c3c16..6b5a73238 100644 --- a/roles/openshift_master/vars/main.yml +++ b/roles/openshift_master/vars/main.yml @@ -6,7 +6,7 @@ loopback_context_string: "current-context: {{ openshift.master.loopback_context_ openshift_master_scheduler_conf: "{{ openshift_master_config_dir }}/scheduler.json" openshift_master_session_secrets_file: "{{ openshift_master_config_dir }}/session-secrets.yaml" openshift_master_policy: "{{ openshift_master_config_dir }}/policy.json" -openshift_version: "{{ openshift_pkg_version | default('') }}" +openshift_version: "{{ openshift_pkg_version | default(openshift_image_tag) | default(openshift.common.image_tag) | default('') }}" ha_svc_template_path: "{{ 'docker-cluster' if openshift.common.is_containerized | bool else 'native-cluster' }}" ha_svc_svc_dir: "{{ '/etc/systemd/system' if openshift.common.is_containerized | bool else '/usr/lib/systemd/system' }}" |