diff options
| author | Rich Megginson <rmeggins@redhat.com> | 2017-05-03 18:14:16 -0600 |
|---|---|---|
| committer | Rich Megginson <rmeggins@redhat.com> | 2017-05-30 10:39:02 -0600 |
| commit | a1cfec9bbe43dd005ab16792c90cc949555cce12 (patch) | |
| tree | 8ac6efa0782dd6e6dbd74a6164249c730a607a69 /roles/lib_openshift/src/ansible | |
| parent | 46411cfc431f7960df542c5bdcf62c65f612a965 (diff) | |
| download | openshift-a1cfec9bbe43dd005ab16792c90cc949555cce12.tar.gz openshift-a1cfec9bbe43dd005ab16792c90cc949555cce12.tar.bz2 openshift-a1cfec9bbe43dd005ab16792c90cc949555cce12.tar.xz openshift-a1cfec9bbe43dd005ab16792c90cc949555cce12.zip | |
add support for oc_service for labels, externalIPs
Add support for `labels` and `externalIPs` in Services
This also adds support for the `labels` parameter of `oadm registry`
and `oadm router` to be a `dict` of values.
This also converts `labels` dict values in the router and registry
classes into a comma delimited list of `key=value` pairs.
The list of `--labels` is sorted for consistency in key pair positioning
in the output (and for consistency in testing) - otherwise, the order
of the list is not guarantee and has actually been observed to be
different from run to run.
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, ) |