diff options
author | Kenny Woodson <kwoodson@redhat.com> | 2017-07-14 08:59:02 -0400 |
---|---|---|
committer | Kenny Woodson <kwoodson@redhat.com> | 2017-07-14 09:03:23 -0400 |
commit | f51e0082fe17f14aec5e14facc143986f47cf260 (patch) | |
tree | d8951d26f4f0242a92faa859cf1e6a339ae99c47 /roles/lib_openshift/src/lib | |
parent | d3cd981326c98984117ae6fd768d63c39257de69 (diff) | |
download | openshift-f51e0082fe17f14aec5e14facc143986f47cf260.tar.gz openshift-f51e0082fe17f14aec5e14facc143986f47cf260.tar.bz2 openshift-f51e0082fe17f14aec5e14facc143986f47cf260.tar.xz openshift-f51e0082fe17f14aec5e14facc143986f47cf260.zip |
Fixing needs_update comparison. Added a small pause for race conditions. Fixed doc. Fix kind to storageclass
Diffstat (limited to 'roles/lib_openshift/src/lib')
-rw-r--r-- | roles/lib_openshift/src/lib/storageclass.py | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/roles/lib_openshift/src/lib/storageclass.py b/roles/lib_openshift/src/lib/storageclass.py index 958bb2876..a01a6b222 100644 --- a/roles/lib_openshift/src/lib/storageclass.py +++ b/roles/lib_openshift/src/lib/storageclass.py @@ -11,7 +11,7 @@ class StorageClassConfig(object): provisioner=None, parameters=None, annotations=None, - default_sc="false", + default_storage_class="false", api_version='v1', kubeconfig='/etc/origin/master/admin.kubeconfig'): ''' constructor for handling storageclass options ''' @@ -20,7 +20,7 @@ class StorageClassConfig(object): self.annotations = annotations self.provisioner = provisioner self.api_version = api_version - self.default_sc = default_sc + self.default_storage_class = str(default_storage_class).lower() self.kubeconfig = kubeconfig self.data = {} @@ -34,7 +34,10 @@ class StorageClassConfig(object): self.data['metadata']['name'] = self.name self.data['metadata']['annotations'] = {} - self.data['metadata']['annotations']['storageclass.beta.kubernetes.io/is-default-class'] = self.default_sc + if self.annotations is not None: + self.data['metadata']['annotations'] = self.annotations + + 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' |