diff options
| author | Kenny Woodson <kwoodson@redhat.com> | 2017-02-22 11:52:43 -0500 |
|---|---|---|
| committer | Kenny Woodson <kwoodson@redhat.com> | 2017-02-22 12:06:40 -0500 |
| commit | 060455ecd15a8ee714cac32aab667e747df1074e (patch) | |
| tree | 81ac2a23116fcb41a94844b1e5f9d53d4802fe20 /roles/lib_openshift/src/class/oc_adm_registry.py | |
| parent | fb2bf36d4e20fadac275d364c88a6586dd08bcb8 (diff) | |
| download | openshift-060455ecd15a8ee714cac32aab667e747df1074e.tar.gz openshift-060455ecd15a8ee714cac32aab667e747df1074e.tar.bz2 openshift-060455ecd15a8ee714cac32aab667e747df1074e.tar.xz openshift-060455ecd15a8ee714cac32aab667e747df1074e.zip | |
Added required_together. Added two minor bug fixes for when data is not passed.
Diffstat (limited to 'roles/lib_openshift/src/class/oc_adm_registry.py')
| -rw-r--r-- | roles/lib_openshift/src/class/oc_adm_registry.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/roles/lib_openshift/src/class/oc_adm_registry.py b/roles/lib_openshift/src/class/oc_adm_registry.py index 8cb7aea31..eb78667ca 100644 --- a/roles/lib_openshift/src/class/oc_adm_registry.py +++ b/roles/lib_openshift/src/class/oc_adm_registry.py @@ -154,7 +154,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 @@ -235,7 +235,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: |