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_node | |
| 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_node')
| -rw-r--r-- | roles/openshift_node/tasks/main.yml | 2 | ||||
| -rw-r--r-- | roles/openshift_node/templates/openvswitch.sysconfig.j2 | 2 | ||||
| -rw-r--r-- | roles/openshift_node/vars/main.yml | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/roles/openshift_node/tasks/main.yml b/roles/openshift_node/tasks/main.yml index 71ed9ba08..b87c2aa21 100644 --- a/roles/openshift_node/tasks/main.yml +++ b/roles/openshift_node/tasks/main.yml @@ -110,7 +110,7 @@ - regex: '^CONFIG_FILE=' line: "CONFIG_FILE={{ openshift_node_config_file }}" - regex: '^IMAGE_VERSION=' - line: "IMAGE_VERSION=v{{ openshift.common.version.split('-')[0] }}" + line: "IMAGE_VERSION={{ openshift_version }}" notify: - restart node diff --git a/roles/openshift_node/templates/openvswitch.sysconfig.j2 b/roles/openshift_node/templates/openvswitch.sysconfig.j2 index 190ffd51b..1f8c20e07 100644 --- a/roles/openshift_node/templates/openvswitch.sysconfig.j2 +++ b/roles/openshift_node/templates/openvswitch.sysconfig.j2 @@ -1 +1 @@ -IMAGE_VERSION={{ openshift.common.image_tag }} +IMAGE_VERSION={{ openshift_version }} diff --git a/roles/openshift_node/vars/main.yml b/roles/openshift_node/vars/main.yml index 43dc50ca8..28582baf1 100644 --- a/roles/openshift_node/vars/main.yml +++ b/roles/openshift_node/vars/main.yml @@ -1,4 +1,4 @@ --- openshift_node_config_dir: "{{ openshift.common.config_base }}/node" openshift_node_config_file: "{{ openshift_node_config_dir }}/node-config.yaml" -openshift_version: "{{ openshift_pkg_version | default('') }}" +openshift_version: "{{ openshift_pkg_version | default(openshift_image_tag) | default(openshift.common.image_tag) | default('') }}" |