From 4e661de1032151b534b0df227d782351f8c14e07 Mon Sep 17 00:00:00 2001 From: Andrew Butcher Date: Thu, 12 Jan 2017 13:23:36 -0500 Subject: 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). --- playbooks/common/openshift-master/config.yml | 5 ----- 1 file changed, 5 deletions(-) (limited to 'playbooks') 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 -- cgit v1.2.3