summaryrefslogtreecommitdiffstats
path: root/roles/lib_openshift/src
diff options
context:
space:
mode:
authorKenny Woodson <kwoodson@redhat.com>2017-02-22 11:52:43 -0500
committerKenny Woodson <kwoodson@redhat.com>2017-02-22 12:06:40 -0500
commit060455ecd15a8ee714cac32aab667e747df1074e (patch)
tree81ac2a23116fcb41a94844b1e5f9d53d4802fe20 /roles/lib_openshift/src
parentfb2bf36d4e20fadac275d364c88a6586dd08bcb8 (diff)
downloadopenshift-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')
-rw-r--r--roles/lib_openshift/src/ansible/oc_adm_router.py1
-rw-r--r--roles/lib_openshift/src/class/oc_adm_registry.py4
-rw-r--r--roles/lib_openshift/src/class/oc_adm_router.py11
3 files changed, 10 insertions, 6 deletions
diff --git a/roles/lib_openshift/src/ansible/oc_adm_router.py b/roles/lib_openshift/src/ansible/oc_adm_router.py
index 794eff3c2..b6f8e90d0 100644
--- a/roles/lib_openshift/src/ansible/oc_adm_router.py
+++ b/roles/lib_openshift/src/ansible/oc_adm_router.py
@@ -54,6 +54,7 @@ def main():
["cacert_file", "default_cert"],
],
+ required_together=[['cacert_file', 'cert_file', 'key_file']],
supports_check_mode=True,
)
results = Router.run_ansible(module.params, module.check_mode)
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:
diff --git a/roles/lib_openshift/src/class/oc_adm_router.py b/roles/lib_openshift/src/class/oc_adm_router.py
index 1c4e17cf6..ab7c96927 100644
--- a/roles/lib_openshift/src/class/oc_adm_router.py
+++ b/roles/lib_openshift/src/class/oc_adm_router.py
@@ -180,12 +180,13 @@ class Router(OpenShiftCLI):
return deploymentconfig
+ # pylint: disable=too-many-branches
def _prepare_router(self):
'''prepare router for instantiation'''
# if cacert, key, and cert were passed, combine them into a pem file
if (self.config.config_options['cacert_file']['value'] and
- self.config.config_options['cert_file']['value'] and
- self.config.config_options['key_file']['value']):
+ self.config.config_options['cert_file']['value'] and
+ self.config.config_options['key_file']['value']):
router_pem = '/tmp/router.pem'
with open(router_pem, 'w') as rfd:
@@ -243,7 +244,8 @@ class Router(OpenShiftCLI):
oc_objects['DeploymentConfig']['obj'] = self.add_modifications(oc_objects['DeploymentConfig']['obj'])
for oc_type, oc_data in oc_objects.items():
- oc_data['path'] = Utils.create_tmp_file_from_contents(oc_type, oc_data['obj'].yaml_dict)
+ if oc_data['obj'] is not None:
+ oc_data['path'] = Utils.create_tmp_file_from_contents(oc_type, oc_data['obj'].yaml_dict)
return oc_objects
@@ -253,7 +255,8 @@ class Router(OpenShiftCLI):
# pylint: disable=no-member
for _, oc_data in self.prepared_router.items():
- results.append(self._create(oc_data['path']))
+ if oc_data['obj'] is not None:
+ results.append(self._create(oc_data['path']))
rval = 0
for result in results: