diff options
| author | Brenton Leanhardt <bleanhar@redhat.com> | 2016-03-07 16:36:42 -0500 |
|---|---|---|
| committer | Brenton Leanhardt <bleanhar@redhat.com> | 2016-03-07 16:36:42 -0500 |
| commit | 44f443cd5afcad79c9afa49ff4f60c0448512f4f (patch) | |
| tree | 65aa2b1dfb02388d9a6b2d208ad10bc80193a85b /roles/openshift_master | |
| parent | 484547222a9f4dfef8b97c965ce637c56a9fc2e6 (diff) | |
| parent | 64fa37b2b82b5f27fdbdca5a943e5c8158408e3d (diff) | |
| download | openshift-44f443cd5afcad79c9afa49ff4f60c0448512f4f.tar.gz openshift-44f443cd5afcad79c9afa49ff4f60c0448512f4f.tar.bz2 openshift-44f443cd5afcad79c9afa49ff4f60c0448512f4f.tar.xz openshift-44f443cd5afcad79c9afa49ff4f60c0448512f4f.zip | |
Merge pull request #1559 from brenton/bz1315151
BZ1315151: Support openshift_image_tag
Diffstat (limited to 'roles/openshift_master')
4 files changed, 4 insertions, 4 deletions
diff --git a/roles/openshift_master/templates/atomic-openshift-master.j2 b/roles/openshift_master/templates/atomic-openshift-master.j2 index 9342614a3..8602a492e 100644 --- a/roles/openshift_master/templates/atomic-openshift-master.j2 +++ b/roles/openshift_master/templates/atomic-openshift-master.j2 @@ -1,7 +1,7 @@ OPTIONS=--loglevel={{ openshift.master.debug_level }} CONFIG_FILE={{ openshift_master_config_file }} {% if openshift.common.is_containerized %} -IMAGE_VERSION={{ openshift.common.image_tag }} +IMAGE_VERSION={{ openshift_version }} {% endif %} # Proxy configuration diff --git a/roles/openshift_master/templates/native-cluster/atomic-openshift-master-api.j2 b/roles/openshift_master/templates/native-cluster/atomic-openshift-master-api.j2 index cfa3b3bfc..f953de404 100644 --- a/roles/openshift_master/templates/native-cluster/atomic-openshift-master-api.j2 +++ b/roles/openshift_master/templates/native-cluster/atomic-openshift-master-api.j2 @@ -1,7 +1,7 @@ OPTIONS=--loglevel={{ openshift.master.debug_level }} --listen={{ 'https' if openshift.master.api_use_ssl else 'http' }}://{{ openshift.master.bind_addr }}:{{ openshift.master.api_port }} --master={{ openshift.master.loopback_api_url }} CONFIG_FILE={{ openshift_master_config_file }} {% if openshift.common.is_containerized %} -IMAGE_VERSION={{ openshift.common.image_tag }} +IMAGE_VERSION={{ openshift_version }} {% endif %} # Proxy configuration diff --git a/roles/openshift_master/templates/native-cluster/atomic-openshift-master-controllers.j2 b/roles/openshift_master/templates/native-cluster/atomic-openshift-master-controllers.j2 index 0b86f5f6b..30da9d396 100644 --- a/roles/openshift_master/templates/native-cluster/atomic-openshift-master-controllers.j2 +++ b/roles/openshift_master/templates/native-cluster/atomic-openshift-master-controllers.j2 @@ -1,7 +1,7 @@ OPTIONS=--loglevel={{ openshift.master.debug_level }} --listen={{ 'https' if openshift.master.api_use_ssl else 'http' }}://{{ openshift.master.bind_addr }}:{{ openshift.master.controllers_port }} CONFIG_FILE={{ openshift_master_config_file }} {% if openshift.common.is_containerized %} -IMAGE_VERSION={{ openshift.common.image_tag }} +IMAGE_VERSION={{ openshift_version }} {% endif %} # Proxy configuration 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' }}" |