diff options
| author | Diego Abelenda <diego.abelenda@camptocamp.com> | 2017-11-20 16:25:46 +0100 |
|---|---|---|
| committer | Diego Abelenda <diego.abelenda@camptocamp.com> | 2017-11-24 13:36:30 +0100 |
| commit | 984655cb741278409f065474776b55eec8b75134 (patch) | |
| tree | 15c8b581407a7c75654c97b53988dc4a8ed0fbff | |
| parent | 24a25b94cf1b6b2f19cf12b3c8d54cd2bb0fd696 (diff) | |
| download | openshift-984655cb741278409f065474776b55eec8b75134.tar.gz openshift-984655cb741278409f065474776b55eec8b75134.tar.bz2 openshift-984655cb741278409f065474776b55eec8b75134.tar.xz openshift-984655cb741278409f065474776b55eec8b75134.zip | |
Change the name of the variable and explicitely document the names
| -rw-r--r-- | roles/openshift_hosted/tasks/create_groups.yml | 15 | ||||
| -rw-r--r-- | roles/openshift_prometheus/README.md | 4 | ||||
| -rw-r--r-- | roles/openshift_prometheus/tasks/install_prometheus.yaml | 2 |
3 files changed, 19 insertions, 2 deletions
diff --git a/roles/openshift_hosted/tasks/create_groups.yml b/roles/openshift_hosted/tasks/create_groups.yml new file mode 100644 index 000000000..e2073cfbd --- /dev/null +++ b/roles/openshift_hosted/tasks/create_groups.yml @@ -0,0 +1,15 @@ +--- +#- name: Create additionnal Groups +# oc_obj: +# kind: Group +# name: "{{ item.key }}" +# users: "{{ item.users }}" +# with_dict: "{{ openshift_additionnal_groups }}" + +- name: Create CronJob LdapSyncConfig + oc_obj: + kind: CronJob + name: AutoLdapSync + content: + + with_item: "{{ openshift_groups_ldapsync_config }}" diff --git a/roles/openshift_prometheus/README.md b/roles/openshift_prometheus/README.md index 9e43da5c3..f1bbb3ca6 100644 --- a/roles/openshift_prometheus/README.md +++ b/roles/openshift_prometheus/README.md @@ -25,7 +25,9 @@ For default values, see [`defaults/main.yaml`](defaults/main.yaml). - `openshift_prometheus_args`: Modify or add arguments for prometheus application -- `openshift_prometheus_<COMPONENT>_hostname`: specify the hostname for the route of that compontent: defaults to `<COMPONENT>-{{openshift_prometheus_namespace}}.{{openshift_master_default_subdomain}}` +- `openshift_prometheus_hostname`: specify the hostname for the route to prometheus `prometheus-{{openshift_prometheus_namespace}}.{{openshift_master_default_subdomain}}` + +- `openshift_prometheus_alerts_hostname`: specify the hostname for the route to prometheus `prometheus_alerts-{{openshift_prometheus_namespace}}.{{openshift_master_default_subdomain}}` e.g ``` diff --git a/roles/openshift_prometheus/tasks/install_prometheus.yaml b/roles/openshift_prometheus/tasks/install_prometheus.yaml index 1241c371a..ad15dc65f 100644 --- a/roles/openshift_prometheus/tasks/install_prometheus.yaml +++ b/roles/openshift_prometheus/tasks/install_prometheus.yaml @@ -119,7 +119,7 @@ tls_termination: reencrypt with_items: - name: prometheus - host: "{{ openshift_prometheus_prometheus_hostname }}" + host: "{{ openshift_prometheus_hostname }}" - name: alerts host: "{{ openshift_prometheus_alerts_hostname }}" |