diff options
| author | Kenny Woodson <kwoodson@redhat.com> | 2017-01-26 14:22:50 -0500 |
|---|---|---|
| committer | Kenny Woodson <kwoodson@redhat.com> | 2017-01-26 14:22:50 -0500 |
| commit | 1e7bd9bf98531d7a6666937df54484641bfe3a15 (patch) | |
| tree | da7db7c1d44c0de45ce8db346f1b7856e3bf1374 /roles/lib_openshift/library/oadm_manage_node.py | |
| parent | 853170d0e42ef23b8986e7b1a266232709f5b6f9 (diff) | |
| download | openshift-1e7bd9bf98531d7a6666937df54484641bfe3a15.tar.gz openshift-1e7bd9bf98531d7a6666937df54484641bfe3a15.tar.bz2 openshift-1e7bd9bf98531d7a6666937df54484641bfe3a15.tar.xz openshift-1e7bd9bf98531d7a6666937df54484641bfe3a15.zip | |
Fixing base.py for node and scale. Autogenerated code.
Diffstat (limited to 'roles/lib_openshift/library/oadm_manage_node.py')
| -rw-r--r-- | roles/lib_openshift/library/oadm_manage_node.py | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/roles/lib_openshift/library/oadm_manage_node.py b/roles/lib_openshift/library/oadm_manage_node.py index dc605a574..39e6384da 100644 --- a/roles/lib_openshift/library/oadm_manage_node.py +++ b/roles/lib_openshift/library/oadm_manage_node.py @@ -814,12 +814,11 @@ class OpenShiftCLI(object): cmd = ['get', resource] if selector: cmd.append('--selector=%s' % selector) + elif rname: + cmd.append(rname) cmd.extend(['-o', 'json']) - if rname: - cmd.append(rname) - rval = self.openshift_cmd(cmd, output=True) # Ensure results are retuned in an array @@ -1430,7 +1429,6 @@ class ManageNode(OpenShiftCLI): return {'changed': changed, 'results': results, 'state': "present"} - # -*- -*- -*- End included fragment: class/oadm_manage_node.py -*- -*- -*- # -*- -*- -*- Begin included fragment: ansible/oadm_manage_node.py -*- -*- -*- |