diff options
| author | Scott Dodson <sdodson@redhat.com> | 2017-05-31 09:36:30 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-05-31 09:36:30 -0400 |
| commit | 15221b6943df7e54ff00db6271ee89eb5cbe0425 (patch) | |
| tree | b7b32d862c0b8ed3e037c26271a9f384493e07f8 /roles/lib_openshift/src/ansible | |
| parent | 61324060fde1435ff1c819858bb4271352458a68 (diff) | |
| parent | a1cfec9bbe43dd005ab16792c90cc949555cce12 (diff) | |
| download | openshift-15221b6943df7e54ff00db6271ee89eb5cbe0425.tar.gz openshift-15221b6943df7e54ff00db6271ee89eb5cbe0425.tar.bz2 openshift-15221b6943df7e54ff00db6271ee89eb5cbe0425.tar.xz openshift-15221b6943df7e54ff00db6271ee89eb5cbe0425.zip | |
Merge pull request #4091 from richm/oc_service-labels-externalIPs
add support for oc_service for labels, externalIPs
Diffstat (limited to 'roles/lib_openshift/src/ansible')
| -rw-r--r-- | roles/lib_openshift/src/ansible/oc_adm_registry.py | 2 | ||||
| -rw-r--r-- | roles/lib_openshift/src/ansible/oc_adm_router.py | 2 | ||||
| -rw-r--r-- | roles/lib_openshift/src/ansible/oc_service.py | 1 |
3 files changed, 3 insertions, 2 deletions
diff --git a/roles/lib_openshift/src/ansible/oc_adm_registry.py b/roles/lib_openshift/src/ansible/oc_adm_registry.py index c85973c7d..d669a3488 100644 --- a/roles/lib_openshift/src/ansible/oc_adm_registry.py +++ b/roles/lib_openshift/src/ansible/oc_adm_registry.py @@ -17,7 +17,7 @@ def main(): kubeconfig=dict(default='/etc/origin/master/admin.kubeconfig', type='str'), images=dict(default=None, type='str'), latest_images=dict(default=False, type='bool'), - labels=dict(default=None, type='list'), + labels=dict(default=None, type='dict'), ports=dict(default=['5000'], type='list'), replicas=dict(default=1, type='int'), selector=dict(default=None, type='str'), diff --git a/roles/lib_openshift/src/ansible/oc_adm_router.py b/roles/lib_openshift/src/ansible/oc_adm_router.py index b6f8e90d0..c6563cc2f 100644 --- a/roles/lib_openshift/src/ansible/oc_adm_router.py +++ b/roles/lib_openshift/src/ansible/oc_adm_router.py @@ -21,7 +21,7 @@ def main(): key_file=dict(default=None, type='str'), images=dict(default=None, type='str'), #'openshift3/ose-${component}:${version}' latest_images=dict(default=False, type='bool'), - labels=dict(default=None, type='list'), + labels=dict(default=None, type='dict'), ports=dict(default=['80:80', '443:443'], type='list'), replicas=dict(default=1, type='int'), selector=dict(default=None, type='str'), diff --git a/roles/lib_openshift/src/ansible/oc_service.py b/roles/lib_openshift/src/ansible/oc_service.py index 9eb144e9c..b90c08255 100644 --- a/roles/lib_openshift/src/ansible/oc_service.py +++ b/roles/lib_openshift/src/ansible/oc_service.py @@ -21,6 +21,7 @@ def main(): ports=dict(default=None, type='list'), session_affinity=dict(default='None', type='str'), service_type=dict(default='ClusterIP', type='str'), + external_ips=dict(default=None, type='list'), ), supports_check_mode=True, ) |