diff options
| author | Kenny Woodson <kwoodson@redhat.com> | 2017-02-22 12:16:39 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-02-22 12:16:39 -0500 |
| commit | 5b2023504639049ad1fd2c70a5d96802ae307e63 (patch) | |
| tree | 4700a21ad4309ed202bc3a9fa3147d5919ab246c /roles/lib_openshift/library/oc_adm_registry.py | |
| parent | 9900db7dbc1e8544972861f259dd4b7e911cfa22 (diff) | |
| parent | 060455ecd15a8ee714cac32aab667e747df1074e (diff) | |
| download | openshift-5b2023504639049ad1fd2c70a5d96802ae307e63.tar.gz openshift-5b2023504639049ad1fd2c70a5d96802ae307e63.tar.bz2 openshift-5b2023504639049ad1fd2c70a5d96802ae307e63.tar.xz openshift-5b2023504639049ad1fd2c70a5d96802ae307e63.zip | |
Merge pull request #3447 from kwoodson/router_no_default_cert
Fix for no default_cert or cert, key, cacert files
Diffstat (limited to 'roles/lib_openshift/library/oc_adm_registry.py')
| -rw-r--r-- | roles/lib_openshift/library/oc_adm_registry.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/roles/lib_openshift/library/oc_adm_registry.py b/roles/lib_openshift/library/oc_adm_registry.py index 32a4f8637..5b5d823e6 100644 --- a/roles/lib_openshift/library/oc_adm_registry.py +++ b/roles/lib_openshift/library/oc_adm_registry.py @@ -2226,7 +2226,7 @@ class Registry(OpenShiftCLI): # probably need to parse this # pylint thinks results is a string # pylint: disable=no-member - if results['returncode'] != 0 and results['results'].has_key('items'): + if results['returncode'] != 0 and 'items' in results['results']: return results service = None @@ -2307,7 +2307,7 @@ class Registry(OpenShiftCLI): # Currently we know that our deployment of a registry requires a few extra modifications # Modification 1 # we need specific environment variables to be set - for key, value in self.config.config_options['env_vars']['value'].items(): + for key, value in self.config.config_options['env_vars'].get('value', {}).items(): if not deploymentconfig.exists_env_key(key): deploymentconfig.add_env_value(key, value) else: |