diff options
| author | Scott Dodson <sdodson@redhat.com> | 2017-07-27 21:13:04 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-27 21:13:04 -0400 |
| commit | 5c7843f49d77455be6599f55da6c82e15fb3bf19 (patch) | |
| tree | 354da72e1f2ff23f481ed529d03656f54813b53f /roles | |
| parent | 7dddb07d4c81482835670d8f1de73fde092c8c60 (diff) | |
| parent | 954b490f498a76e948fd1da06ca44e1ff8498612 (diff) | |
| download | openshift-5c7843f49d77455be6599f55da6c82e15fb3bf19.tar.gz openshift-5c7843f49d77455be6599f55da6c82e15fb3bf19.tar.bz2 openshift-5c7843f49d77455be6599f55da6c82e15fb3bf19.tar.xz openshift-5c7843f49d77455be6599f55da6c82e15fb3bf19.zip | |
Merge pull request #4843 from kwoodson/sc_require_prov
Remove default and force argument for storageclass provisioner.
Diffstat (limited to 'roles')
| -rw-r--r-- | roles/lib_openshift/library/oc_storageclass.py | 9 | ||||
| -rw-r--r-- | roles/lib_openshift/src/ansible/oc_storageclass.py | 2 | ||||
| -rw-r--r-- | roles/lib_openshift/src/lib/storageclass.py | 7 |
3 files changed, 6 insertions, 12 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'), ), diff --git a/roles/lib_openshift/src/ansible/oc_storageclass.py b/roles/lib_openshift/src/ansible/oc_storageclass.py index 2bd8f18d5..e9f3ebbd3 100644 --- a/roles/lib_openshift/src/ansible/oc_storageclass.py +++ b/roles/lib_openshift/src/ansible/oc_storageclass.py @@ -14,7 +14,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'), ), diff --git a/roles/lib_openshift/src/lib/storageclass.py b/roles/lib_openshift/src/lib/storageclass.py index ef12a8d2d..c49a3066a 100644 --- a/roles/lib_openshift/src/lib/storageclass.py +++ b/roles/lib_openshift/src/lib/storageclass.py @@ -8,7 +8,7 @@ class StorageClassConfig(object): # pylint: disable=too-many-arguments def __init__(self, name, - provisioner=None, + provisioner, parameters=None, annotations=None, default_storage_class="false", @@ -40,10 +40,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: |