summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScott Dodson <sdodson@redhat.com>2017-01-16 11:26:02 -0500
committerGitHub <noreply@github.com>2017-01-16 11:26:02 -0500
commite68f1946e665c2d0f8af0fdb96c96d966a4353ef (patch)
tree30eba6025c013b3dbb49337429398efa939fc412
parent62918051b0526d9e86f8f569ceba8574a18b61ec (diff)
parent4e661de1032151b534b0df227d782351f8c14e07 (diff)
downloadopenshift-e68f1946e665c2d0f8af0fdb96c96d966a4353ef.tar.gz
openshift-e68f1946e665c2d0f8af0fdb96c96d966a4353ef.tar.bz2
openshift-e68f1946e665c2d0f8af0fdb96c96d966a4353ef.tar.xz
openshift-e68f1946e665c2d0f8af0fdb96c96d966a4353ef.zip
Merge pull request #3085 from abutcher/no-nfs-group-default
Do not default registry storage kind to 'nfs' when 'nfs' host group exists.
-rw-r--r--playbooks/common/openshift-master/config.yml5
1 files changed, 0 insertions, 5 deletions
diff --git a/playbooks/common/openshift-master/config.yml b/playbooks/common/openshift-master/config.yml
index 21f3c80a1..39d64a126 100644
--- a/playbooks/common/openshift-master/config.yml
+++ b/playbooks/common/openshift-master/config.yml
@@ -74,11 +74,6 @@
public_console_url: "{{ openshift_master_public_console_url | default(None) }}"
ha: "{{ openshift_master_ha | default(groups.oo_masters | length > 1) }}"
master_count: "{{ openshift_master_count | default(groups.oo_masters | length) }}"
- - openshift_facts:
- role: hosted
- openshift_env:
- openshift_hosted_registry_storage_kind: 'nfs'
- when: openshift_hosted_registry_storage_kind is not defined and groups.oo_nfs_to_config is defined and groups.oo_nfs_to_config | length > 0
- name: Create temp directory for syncing certs
hosts: localhost