summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2017-10-30 15:56:15 -0700
committerGitHub <noreply@github.com>2017-10-30 15:56:15 -0700
commit00aa32cfdb73075ab08083a3c64ffd7ffaa342cf (patch)
tree263f082e3762c1bb4f25ae33d530d0c2dc0056d4
parentf4724095b84de7dfd88df2541941edf5d674ffd8 (diff)
parent748875e210d13f665a40715cba98139b99a45858 (diff)
downloadopenshift-00aa32cfdb73075ab08083a3c64ffd7ffaa342cf.tar.gz
openshift-00aa32cfdb73075ab08083a3c64ffd7ffaa342cf.tar.bz2
openshift-00aa32cfdb73075ab08083a3c64ffd7ffaa342cf.tar.xz
openshift-00aa32cfdb73075ab08083a3c64ffd7ffaa342cf.zip
Merge pull request #5884 from barlik/master
Automatic merge from submit-queue. Fix broken oc_secret update function
-rw-r--r--roles/lib_openshift/library/oc_secret.py2
-rw-r--r--roles/lib_openshift/src/class/oc_secret.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/roles/lib_openshift/library/oc_secret.py b/roles/lib_openshift/library/oc_secret.py
index 0614f359d..62bda33ad 100644
--- a/roles/lib_openshift/library/oc_secret.py
+++ b/roles/lib_openshift/library/oc_secret.py
@@ -1633,7 +1633,7 @@ class OCSecret(OpenShiftCLI):
This receives a list of file names and converts it into a secret.
The secret is then written to disk and passed into the `oc replace` command.
'''
- secret = self.prep_secret(files, force)
+ secret = self.prep_secret(files, force=force)
if secret['returncode'] != 0:
return secret
diff --git a/roles/lib_openshift/src/class/oc_secret.py b/roles/lib_openshift/src/class/oc_secret.py
index 5322d6241..89e70b6b2 100644
--- a/roles/lib_openshift/src/class/oc_secret.py
+++ b/roles/lib_openshift/src/class/oc_secret.py
@@ -67,7 +67,7 @@ class OCSecret(OpenShiftCLI):
This receives a list of file names and converts it into a secret.
The secret is then written to disk and passed into the `oc replace` command.
'''
- secret = self.prep_secret(files, force)
+ secret = self.prep_secret(files, force=force)
if secret['returncode'] != 0:
return secret