diff options
| author | Brenton Leanhardt <bleanhar@redhat.com> | 2016-04-06 09:53:35 -0400 |
|---|---|---|
| committer | Brenton Leanhardt <bleanhar@redhat.com> | 2016-04-06 09:53:35 -0400 |
| commit | 6cd266510dfa5423ae9af60ba191ff3aa1016100 (patch) | |
| tree | 47d7ad52cb291a10c6f329dd00cc02eb56dd9ee9 /roles/openshift_node | |
| parent | bd48369d0f9baf9d9635b1cc2cb3ed23de1f9bf6 (diff) | |
| parent | 590e5582ed22a491ed2a4701492083fa6521f047 (diff) | |
| download | openshift-6cd266510dfa5423ae9af60ba191ff3aa1016100.tar.gz openshift-6cd266510dfa5423ae9af60ba191ff3aa1016100.tar.bz2 openshift-6cd266510dfa5423ae9af60ba191ff3aa1016100.tar.xz openshift-6cd266510dfa5423ae9af60ba191ff3aa1016100.zip | |
Merge pull request #1695 from brenton/bz1323123
Fixing bugs 1322788 and 1323123
Diffstat (limited to 'roles/openshift_node')
| -rw-r--r-- | roles/openshift_node/defaults/main.yml | 1 | ||||
| -rw-r--r-- | roles/openshift_node/vars/main.yml | 1 |
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('') }}" |