diff options
| -rw-r--r-- | roles/lib_openshift/library/oc_storageclass.py | 7 | ||||
| -rw-r--r-- | roles/lib_openshift/src/class/oc_storageclass.py | 4 | ||||
| -rw-r--r-- | roles/lib_openshift/src/lib/storageclass.py | 3 |
3 files changed, 8 insertions, 6 deletions
diff --git a/roles/lib_openshift/library/oc_storageclass.py b/roles/lib_openshift/library/oc_storageclass.py index 37c8f9ebc..d5375e27a 100644 --- a/roles/lib_openshift/library/oc_storageclass.py +++ b/roles/lib_openshift/library/oc_storageclass.py @@ -1456,7 +1456,8 @@ class StorageClassConfig(object): 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 + 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' @@ -1542,8 +1543,8 @@ class OCStorageClass(OpenShiftCLI): '''update the object''' # parameters are currently unable to be updated. need to delete and recreate self.delete() - # pause here and attempt to wait for delete. - # Better option would be to poll + # pause here and attempt to wait for delete. + # Better option would be to poll import time time.sleep(5) return self.create() diff --git a/roles/lib_openshift/src/class/oc_storageclass.py b/roles/lib_openshift/src/class/oc_storageclass.py index 34ebf7c41..aced586ae 100644 --- a/roles/lib_openshift/src/class/oc_storageclass.py +++ b/roles/lib_openshift/src/class/oc_storageclass.py @@ -46,8 +46,8 @@ class OCStorageClass(OpenShiftCLI): '''update the object''' # parameters are currently unable to be updated. need to delete and recreate self.delete() - # pause here and attempt to wait for delete. - # Better option would be to poll + # pause here and attempt to wait for delete. + # Better option would be to poll import time time.sleep(5) return self.create() diff --git a/roles/lib_openshift/src/lib/storageclass.py b/roles/lib_openshift/src/lib/storageclass.py index a01a6b222..ef12a8d2d 100644 --- a/roles/lib_openshift/src/lib/storageclass.py +++ b/roles/lib_openshift/src/lib/storageclass.py @@ -37,7 +37,8 @@ class StorageClassConfig(object): 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 + 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' |