summaryrefslogtreecommitdiffstats
path: root/roles/lib_openshift/library
diff options
context:
space:
mode:
authorKenny Woodson <kwoodson@redhat.com>2017-07-24 11:05:18 -0400
committerKenny Woodson <kwoodson@redhat.com>2017-07-24 11:11:09 -0400
commit954b490f498a76e948fd1da06ca44e1ff8498612 (patch)
tree4cb390cbf4be73ea20de1a2270b3e96d9c6b4910 /roles/lib_openshift/library
parent1e2fa74befff5d4ece1f788ee24eb23523abd084 (diff)
downloadopenshift-954b490f498a76e948fd1da06ca44e1ff8498612.tar.gz
openshift-954b490f498a76e948fd1da06ca44e1ff8498612.tar.bz2
openshift-954b490f498a76e948fd1da06ca44e1ff8498612.tar.xz
openshift-954b490f498a76e948fd1da06ca44e1ff8498612.zip
Remove default provisioner.
Diffstat (limited to 'roles/lib_openshift/library')
-rw-r--r--roles/lib_openshift/library/oc_storageclass.py9
1 files changed, 3 insertions, 6 deletions
diff --git a/roles/lib_openshift/library/oc_storageclass.py b/roles/lib_openshift/library/oc_storageclass.py
index d5375e27a..686119c65 100644
--- a/roles/lib_openshift/library/oc_storageclass.py
+++ b/roles/lib_openshift/library/oc_storageclass.py
@@ -1427,7 +1427,7 @@ class StorageClassConfig(object):
# pylint: disable=too-many-arguments
def __init__(self,
name,
- provisioner=None,
+ provisioner,
parameters=None,
annotations=None,
default_storage_class="false",
@@ -1459,10 +1459,7 @@ class StorageClassConfig(object):
self.data['metadata']['annotations']['storageclass.beta.kubernetes.io/is-default-class'] = \
self.default_storage_class
- if self.provisioner is None:
- self.data['provisioner'] = 'kubernetes.io/aws-ebs'
- else:
- self.data['provisioner'] = self.provisioner
+ self.data['provisioner'] = self.provisioner
self.data['parameters'] = {}
if self.parameters is not None:
@@ -1668,7 +1665,7 @@ def main():
name=dict(default=None, type='str'),
annotations=dict(default=None, type='dict'),
parameters=dict(default=None, type='dict'),
- provisioner=dict(default='aws-ebs', type='str', choices=['aws-ebs', 'gce-pd', 'glusterfs', 'cinder']),
+ provisioner=dict(required=True, type='str', choices=['aws-ebs', 'gce-pd', 'glusterfs', 'cinder']),
api_version=dict(default='v1', type='str'),
default_storage_class=dict(default="false", type='str'),
),