Bläddra i källkod

Change the name of the variable and explicitely document the names

Diego Abelenda 7 år sedan
förälder
incheckning
984655cb74

+ 15 - 0
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 }}"

+ 3 - 1
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
 ```

+ 1 - 1
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 }}"