From 85c6743a011884abfcdb2ded665e46f46023522e Mon Sep 17 00:00:00 2001 From: Scott Dodson Date: Wed, 17 Aug 2016 13:54:57 -0400 Subject: Add ability to disable pvc creation --- filter_plugins/oo_filters.py | 3 ++- roles/openshift_facts/library/openshift_facts.py | 6 ++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/filter_plugins/oo_filters.py b/filter_plugins/oo_filters.py index 0e4f23922..a4dceb679 100644 --- a/filter_plugins/oo_filters.py +++ b/filter_plugins/oo_filters.py @@ -734,7 +734,8 @@ class FilterModule(object): if 'storage' in hostvars['openshift']['hosted'][component]: kind = hostvars['openshift']['hosted'][component]['storage']['kind'] create_pv = hostvars['openshift']['hosted'][component]['storage']['create_pv'] - if kind != None and create_pv: + create_pvc = hostvars['openshift']['hosted'][component]['storage']['create_pvc'] + if kind != None and create_pv and create_pvc: volume = hostvars['openshift']['hosted'][component]['storage']['volume']['name'] size = hostvars['openshift']['hosted'][component]['storage']['volume']['size'] access_modes = hostvars['openshift']['hosted'][component]['storage']['access_modes'] diff --git a/roles/openshift_facts/library/openshift_facts.py b/roles/openshift_facts/library/openshift_facts.py index b67ef491f..bd8010705 100755 --- a/roles/openshift_facts/library/openshift_facts.py +++ b/roles/openshift_facts/library/openshift_facts.py @@ -1802,7 +1802,8 @@ class OpenShiftFacts(object): volumeID='123'), host=None, access_modes=['ReadWriteOnce'], - create_pv=True + create_pv=True, + create_pvc=False ) ), registry=dict( @@ -1817,7 +1818,8 @@ class OpenShiftFacts(object): options='*(rw,root_squash)'), host=None, access_modes=['ReadWriteMany'], - create_pv=True + create_pv=True, + create_pvc=True ) ), router=dict() -- cgit v1.2.3