summaryrefslogtreecommitdiffstats
path: root/roles/openshift_node
diff options
context:
space:
mode:
authorBrenton Leanhardt <bleanhar@redhat.com>2016-04-01 11:40:46 -0400
committerBrenton Leanhardt <bleanhar@redhat.com>2016-04-01 14:20:24 -0400
commit590e5582ed22a491ed2a4701492083fa6521f047 (patch)
tree7c26314ccafcf276e47e506153932cea236022a8 /roles/openshift_node
parentcca99e30e92168b379a435ff70b66cdd768d8a83 (diff)
downloadopenshift-590e5582ed22a491ed2a4701492083fa6521f047.tar.gz
openshift-590e5582ed22a491ed2a4701492083fa6521f047.tar.bz2
openshift-590e5582ed22a491ed2a4701492083fa6521f047.tar.xz
openshift-590e5582ed22a491ed2a4701492083fa6521f047.zip
Bug 1322788 - The IMAGE_VERSION wasn't added to atomic-openshift-master-api and atomic-openshift-master-controllers
Diffstat (limited to 'roles/openshift_node')
-rw-r--r--roles/openshift_node/defaults/main.yml1
-rw-r--r--roles/openshift_node/vars/main.yml1
2 files changed, 1 insertions, 1 deletions
diff --git a/roles/openshift_node/defaults/main.yml b/roles/openshift_node/defaults/main.yml
index fffbf2994..c4f718bfb 100644
--- a/roles/openshift_node/defaults/main.yml
+++ b/roles/openshift_node/defaults/main.yml
@@ -13,3 +13,4 @@ os_firewall_allow:
- service: OpenShift OVS sdn
port: 4789/udp
when: openshift.node.use_openshift_sdn | bool
+openshift_version: "{{ openshift_pkg_version | default(openshift_image_tag) | default(openshift.common.image_tag) | default('') }}"
diff --git a/roles/openshift_node/vars/main.yml b/roles/openshift_node/vars/main.yml
index 28582baf1..77a9694de 100644
--- a/roles/openshift_node/vars/main.yml
+++ b/roles/openshift_node/vars/main.yml
@@ -1,4 +1,3 @@
---
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_image_tag) | default(openshift.common.image_tag) | default('') }}"