diff options
author | Andrew Butcher <abutcher@afrolegs.com> | 2017-02-27 16:13:05 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-02-27 16:13:05 -0500 |
commit | 0550138a592bc3bf202a44ed9a3e4d575e70add3 (patch) | |
tree | 9deb78cc4e324a01706d22f72de8240e98c505dd /roles/lib_openshift/library/oc_secret.py | |
parent | 833eb4ccfed255004ba21b51bab3c022201bbc83 (diff) | |
parent | 3c44e4293825b8f3aafa80bb60599476de3be57d (diff) | |
download | openshift-0550138a592bc3bf202a44ed9a3e4d575e70add3.tar.gz openshift-0550138a592bc3bf202a44ed9a3e4d575e70add3.tar.bz2 openshift-0550138a592bc3bf202a44ed9a3e4d575e70add3.tar.xz openshift-0550138a592bc3bf202a44ed9a3e4d575e70add3.zip |
Merge pull request #3510 from abutcher/router-upgrade
Bug 1427080: The router wasn't upgraded to current ose-haproxy-router image version
Diffstat (limited to 'roles/lib_openshift/library/oc_secret.py')
-rw-r--r-- | roles/lib_openshift/library/oc_secret.py | 4 |
1 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 db9a3a7ec..bf1f788eb 100644 --- a/roles/lib_openshift/library/oc_secret.py +++ b/roles/lib_openshift/library/oc_secret.py @@ -1043,13 +1043,13 @@ class OpenShiftCLI(object): if oadm: cmds.append('adm') + cmds.extend(cmd) + if self.all_namespaces: cmds.extend(['--all-namespaces']) elif self.namespace is not None and self.namespace.lower() not in ['none', 'emtpy']: # E501 cmds.extend(['-n', self.namespace]) - cmds.extend(cmd) - rval = {} results = '' err = None |