diff options
| author | Brenton Leanhardt <bleanhar@redhat.com> | 2015-09-08 08:43:06 -0400 |
|---|---|---|
| committer | Brenton Leanhardt <bleanhar@redhat.com> | 2015-09-08 08:43:06 -0400 |
| commit | 63ad6b61144cf610a813f2022bcbab5ddacf729a (patch) | |
| tree | d3da412069f8e2fb18a1963227b236aa7850c0d0 /roles/openshift_master/vars | |
| parent | 318ac6b9b65f42f032382114f35d3c9fa7f5610b (diff) | |
| parent | 07c59ea91a8e87d1b7edbb88ae6012ac13643f52 (diff) | |
| download | openshift-63ad6b61144cf610a813f2022bcbab5ddacf729a.tar.gz openshift-63ad6b61144cf610a813f2022bcbab5ddacf729a.tar.bz2 openshift-63ad6b61144cf610a813f2022bcbab5ddacf729a.tar.xz openshift-63ad6b61144cf610a813f2022bcbab5ddacf729a.zip | |
Merge pull request #563 from sdodson/fix-recursive-loop
Avoid a recursive loop
Diffstat (limited to 'roles/openshift_master/vars')
| -rw-r--r-- | roles/openshift_master/vars/main.yml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/roles/openshift_master/vars/main.yml b/roles/openshift_master/vars/main.yml index cce118cf1..ecdb4f883 100644 --- a/roles/openshift_master/vars/main.yml +++ b/roles/openshift_master/vars/main.yml @@ -3,7 +3,7 @@ openshift_master_config_dir: "{{ openshift.common.config_base }}/master" openshift_master_config_file: "{{ openshift_master_config_dir }}/master-config.yaml" openshift_master_scheduler_conf: "{{ openshift_master_config_dir }}/scheduler.json" openshift_master_policy: "{{ openshift_master_config_dir }}/policy.json" -openshift_version: "{{ openshift_version | default('') }}" +openshift_version: "{{ openshift_pkg_version | default('') }}" openshift_master_valid_grant_methods: - auto |