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 | |
| 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
| -rw-r--r-- | inventory/byo/hosts.example | 2 | ||||
| -rw-r--r-- | roles/openshift_master/vars/main.yml | 2 | ||||
| -rw-r--r-- | roles/openshift_master_ca/vars/main.yml | 2 | ||||
| -rw-r--r-- | roles/openshift_node/vars/main.yml | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/inventory/byo/hosts.example b/inventory/byo/hosts.example index 174bff697..df1bae49f 100644 --- a/inventory/byo/hosts.example +++ b/inventory/byo/hosts.example @@ -70,7 +70,7 @@ openshift_master_identity_providers=[{'name': 'htpasswd_auth', 'login': 'true', #osm_default_node_selector='region=primary' # set RPM version for debugging purposes -#openshift_version=-3.0.0.0 +#openshift_pkg_version=-3.0.0.0 # host group for masters [masters] 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 diff --git a/roles/openshift_master_ca/vars/main.yml b/roles/openshift_master_ca/vars/main.yml index 9e9561e02..b35339b18 100644 --- a/roles/openshift_master_ca/vars/main.yml +++ b/roles/openshift_master_ca/vars/main.yml @@ -3,4 +3,4 @@ openshift_master_config_dir: "{{ openshift.common.config_base }}/master" openshift_master_ca_cert: "{{ openshift_master_config_dir }}/ca.crt" openshift_master_ca_key: "{{ openshift_master_config_dir }}/ca.key" openshift_master_ca_serial: "{{ openshift_master_config_dir }}/ca.serial.txt" -openshift_version: "{{ openshift_version | default('') }}" +openshift_version: "{{ openshift_pkg_version | default('') }}" diff --git a/roles/openshift_node/vars/main.yml b/roles/openshift_node/vars/main.yml index db2c3e15a..43dc50ca8 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_version | default('') }}" +openshift_version: "{{ openshift_pkg_version | default('') }}" |