diff options
| author | OpenShift Bot <eparis+openshiftbot@redhat.com> | 2017-05-16 19:05:42 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-05-16 19:05:42 -0500 |
| commit | bbb54088844b862e6c0b28b1606d3ca3cea76490 (patch) | |
| tree | 06b37db0342b3306bf38666bf984470b766a67d2 /roles | |
| parent | 7d506ff357d2a24a6c510b06c0987528375f1999 (diff) | |
| parent | 75c752d08f63852db6ba4df5f2c4380ba4bcbdc8 (diff) | |
| download | openshift-bbb54088844b862e6c0b28b1606d3ca3cea76490.tar.gz openshift-bbb54088844b862e6c0b28b1606d3ca3cea76490.tar.bz2 openshift-bbb54088844b862e6c0b28b1606d3ca3cea76490.tar.xz openshift-bbb54088844b862e6c0b28b1606d3ca3cea76490.zip | |
Merge pull request #4197 from abutcher/oc_adm_ca_server_cert-hostnames-omit
Merged by openshift-bot
Diffstat (limited to 'roles')
| -rw-r--r-- | roles/lib_openshift/library/oc_adm_ca_server_cert.py | 8 | ||||
| -rw-r--r-- | roles/lib_openshift/src/ansible/oc_adm_ca_server_cert.py | 4 | ||||
| -rw-r--r-- | roles/lib_openshift/src/class/oc_adm_ca_server_cert.py | 4 |
3 files changed, 16 insertions, 0 deletions
diff --git a/roles/lib_openshift/library/oc_adm_ca_server_cert.py b/roles/lib_openshift/library/oc_adm_ca_server_cert.py index 03d3e17c4..a6273cfe4 100644 --- a/roles/lib_openshift/library/oc_adm_ca_server_cert.py +++ b/roles/lib_openshift/library/oc_adm_ca_server_cert.py @@ -1534,6 +1534,10 @@ class CAServerCert(OpenShiftCLI): def run_ansible(params, check_mode): '''run the idempotent ansible code''' + # Filter non-strings from hostnames list s.t. the omit filter + # may be used to conditionally add a hostname. + params['hostnames'] = [host for host in params['hostnames'] if isinstance(host, string_types)] + config = CAServerCertConfig(params['kubeconfig'], params['debug'], {'cert': {'value': params['cert'], 'include': True}, @@ -1583,6 +1587,10 @@ class CAServerCert(OpenShiftCLI): # -*- -*- -*- Begin included fragment: ansible/oc_adm_ca_server_cert.py -*- -*- -*- + +# pylint: disable=wrong-import-position +from ansible.module_utils.six import string_types + def main(): ''' ansible oc adm module for ca create-server-cert diff --git a/roles/lib_openshift/src/ansible/oc_adm_ca_server_cert.py b/roles/lib_openshift/src/ansible/oc_adm_ca_server_cert.py index 10f1c9b4b..fc394cb43 100644 --- a/roles/lib_openshift/src/ansible/oc_adm_ca_server_cert.py +++ b/roles/lib_openshift/src/ansible/oc_adm_ca_server_cert.py @@ -1,6 +1,10 @@ # pylint: skip-file # flake8: noqa + +# pylint: disable=wrong-import-position +from ansible.module_utils.six import string_types + def main(): ''' ansible oc adm module for ca create-server-cert diff --git a/roles/lib_openshift/src/class/oc_adm_ca_server_cert.py b/roles/lib_openshift/src/class/oc_adm_ca_server_cert.py index cf99a6584..37a64e4ef 100644 --- a/roles/lib_openshift/src/class/oc_adm_ca_server_cert.py +++ b/roles/lib_openshift/src/class/oc_adm_ca_server_cert.py @@ -96,6 +96,10 @@ class CAServerCert(OpenShiftCLI): def run_ansible(params, check_mode): '''run the idempotent ansible code''' + # Filter non-strings from hostnames list s.t. the omit filter + # may be used to conditionally add a hostname. + params['hostnames'] = [host for host in params['hostnames'] if isinstance(host, string_types)] + config = CAServerCertConfig(params['kubeconfig'], params['debug'], {'cert': {'value': params['cert'], 'include': True}, |