summaryrefslogtreecommitdiffstats
path: root/playbooks/common/openshift-master
diff options
context:
space:
mode:
authorAndrew Butcher <abutcher@redhat.com>2017-01-12 13:23:36 -0500
committerAndrew Butcher <abutcher@redhat.com>2017-01-12 13:23:46 -0500
commit4e661de1032151b534b0df227d782351f8c14e07 (patch)
treeeb9b10db27854f2b91300f6394721f59d10fbeb5 /playbooks/common/openshift-master
parent1236604d2ddd835ab8559cbf632481a8a21e9bea (diff)
downloadopenshift-4e661de1032151b534b0df227d782351f8c14e07.tar.gz
openshift-4e661de1032151b534b0df227d782351f8c14e07.tar.bz2
openshift-4e661de1032151b534b0df227d782351f8c14e07.tar.xz
openshift-4e661de1032151b534b0df227d782351f8c14e07.zip
Do not default registry storage kind to 'nfs' when 'nfs' group exists.
This makes it possible to use openshift-ansible configured nfs for hosted components other than the registry while also configuring empty-dir registry storage (no openshift_hosted_registry_storage_kind set).
Diffstat (limited to 'playbooks/common/openshift-master')
-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