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_master | |
| 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_master')
| -rw-r--r-- | roles/openshift_master/defaults/main.yml | 2 | ||||
| -rw-r--r-- | roles/openshift_master/vars/main.yml | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/roles/openshift_master/defaults/main.yml b/roles/openshift_master/defaults/main.yml index 1f74d851a..afc81a414 100644 --- a/roles/openshift_master/defaults/main.yml +++ b/roles/openshift_master/defaults/main.yml @@ -28,3 +28,5 @@ os_firewall_deny: port: 8080/tcp - service: former etcd peer port port: 7001/tcp + +openshift_version: "{{ openshift_pkg_version | default(openshift_image_tag) | default(openshift.common.image_tag) | default('') }}" diff --git a/roles/openshift_master/vars/main.yml b/roles/openshift_master/vars/main.yml index 198f9235d..7c1d5a212 100644 --- a/roles/openshift_master/vars/main.yml +++ b/roles/openshift_master/vars/main.yml @@ -6,7 +6,6 @@ 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_image_tag) | default(openshift.common.image_tag) | default('') }}" scheduler_config: kind: Policy |