diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2018-02-13 09:31:50 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-13 09:31:50 -0800 |
| commit | 4d1e757b1e84400f8049b91afc6b9fba5d5d1d9b (patch) | |
| tree | a896a2f40ebe045f7406aa9c1f17376d9bedc5a7 /roles/lib_utils | |
| parent | e2fad4e69710c9d4fd18febd4ab60b0f12b78ef8 (diff) | |
| parent | 0101c000a6e1e944f98a037183d9f222ee9aeb13 (diff) | |
| download | openshift-4d1e757b1e84400f8049b91afc6b9fba5d5d1d9b.tar.gz openshift-4d1e757b1e84400f8049b91afc6b9fba5d5d1d9b.tar.bz2 openshift-4d1e757b1e84400f8049b91afc6b9fba5d5d1d9b.tar.xz openshift-4d1e757b1e84400f8049b91afc6b9fba5d5d1d9b.zip | |
Merge pull request #7106 from jarrpa/pvc-gen-storageclass
Automatic merge from submit-queue.
Allow for blank StorageClass in PVC creation
In the case where a default StorageClass is already defined and a PV's
storage kind is not 'dynamic', allows for the storageClassName of the
associated PVC to be blank so as to not use the default SC.
Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1544387
Signed-off-by: Jose A. Rivera <jarrpa@redhat.com>
Diffstat (limited to 'roles/lib_utils')
| -rw-r--r-- | roles/lib_utils/action_plugins/generate_pv_pvcs_list.py | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/roles/lib_utils/action_plugins/generate_pv_pvcs_list.py b/roles/lib_utils/action_plugins/generate_pv_pvcs_list.py index eb13a58ba..c60742dd3 100644 --- a/roles/lib_utils/action_plugins/generate_pv_pvcs_list.py +++ b/roles/lib_utils/action_plugins/generate_pv_pvcs_list.py @@ -118,10 +118,16 @@ class ActionModule(ActionBase): create_pvc = self._templar.template(create_pvc) if kind != 'object' and create_pv and create_pvc: volume, size, _, access_modes = self.build_common(varname=varname) + storageclass = self.task_vars.get(str(varname) + '_storageclass') + if storageclass: + storageclass = self._templar.template(storageclass) + elif storageclass is None and kind != 'dynamic': + storageclass = '' return dict( name="{0}-claim".format(volume), capacity=size, - access_modes=access_modes) + access_modes=access_modes, + storageclass=storageclass) return None def run(self, tmp=None, task_vars=None): |