diff options
author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2018-02-06 07:41:01 -0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-02-06 07:41:01 -0800 |
commit | a06bc5b19875e7ac665c8c7c6b8400d1f4de0f79 (patch) | |
tree | 9b26625bed554866dcc6ff1e5f5a72b872c6ff4a /roles/openshift_daemonset_config/defaults/main.yml | |
parent | d512d781be3530997522fb38ba29ee7f33eae5c8 (diff) | |
parent | 1a4b2205ae100ca7d7947e18e94c93d690ad9db7 (diff) | |
download | openshift-a06bc5b19875e7ac665c8c7c6b8400d1f4de0f79.tar.gz openshift-a06bc5b19875e7ac665c8c7c6b8400d1f4de0f79.tar.bz2 openshift-a06bc5b19875e7ac665c8c7c6b8400d1f4de0f79.tar.xz openshift-a06bc5b19875e7ac665c8c7c6b8400d1f4de0f79.zip |
Merge pull request #7016 from kwoodson/daemonset_monitoring
Automatic merge from submit-queue.
daemonset config modifications to allow monitoring.
Modifications that allow custom secrets, configmaps, and shared setup between containers for config and monitoring.
Diffstat (limited to 'roles/openshift_daemonset_config/defaults/main.yml')
-rw-r--r-- | roles/openshift_daemonset_config/defaults/main.yml | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/roles/openshift_daemonset_config/defaults/main.yml b/roles/openshift_daemonset_config/defaults/main.yml index ebe5671d2..bb9803c2b 100644 --- a/roles/openshift_daemonset_config/defaults/main.yml +++ b/roles/openshift_daemonset_config/defaults/main.yml @@ -1,16 +1,19 @@ --- -openshift_daemonset_config_namespace: openshift-node -openshift_daemonset_config_daemonset_name: ops-node-config -openshift_daemonset_config_configmap_name: "{{ openshift_daemonset_config_daemonset_name }}" +openshift_daemonset_config_image: "centos:7" +openshift_daemonset_config_monitoring_image: "openshifttools/oso-centos7-host-monitoring:latest" +openshift_daemonset_config_namespace: openshift-config +openshift_daemonset_config_daemonset_name: node-config +openshift_daemonset_config_configmap_name: "{{ openshift_daemonset_config_daemonset_name }}-configmap" +openshift_daemonset_config_monitoring_pos: "false" openshift_daemonset_config_node_selector: config: config -openshift_daemonset_config_sa_name: ops +openshift_daemonset_config_sa_name: configurator openshift_daemonset_config_configmap_files: {} openshift_daemonset_config_configmap_literals: {} openshift_daemonset_config_monitoring: False openshift_daemonset_config_interval: 300 openshift_daemonset_config_script: config.sh -openshift_daemonset_config_secret_name: operations-config-secret +openshift_daemonset_config_secret_name: "{{ openshift_daemonset_config_daemonset_name }}-secret" openshift_daemonset_config_secrets: {} openshift_daemonset_config_runasuser: 0 openshift_daemonset_config_privileged: True |