Using "node_name" instead of custom env vars
Now we have "node_name" variable to render config files Change-Id: I6ff108cf769da846fd878a3f0fb221df2854917f Depends-On: I8ebbbd94803ccb9a8d13eede2db7db8b13673937
This commit is contained in:
parent
9915c8ad1b
commit
3f8ea9410b
|
@ -8,4 +8,4 @@ afd_file = "{{ afd_file }}"
|
|||
afd_cluster_name = "{{ afd_cluster_name }}"
|
||||
afd_logical_name = "{{ afd_logical_name }}"
|
||||
{% endraw %}
|
||||
hostname = "{{ CCP_ALERT_MANAGER_NODE_NAME }}"
|
||||
hostname = "{{ node_name }}"
|
||||
|
|
|
@ -6,7 +6,7 @@ analysis_lua_cpath = "/usr/lib/x86_64-linux-gnu/luasandbox/modules/?.so"
|
|||
io_lua_path = analysis_lua_path .. ";/usr/lib/x86_64-linux-gnu/luasandbox/io_modules/?.lua"
|
||||
io_lua_cpath = analysis_lua_cpath .. ";/usr/lib/x86_64-linux-gnu/luasandbox/io_modules/?.so"
|
||||
|
||||
hostname = "{{ CCP_HINDSIGHT_NODE_NAME }}"
|
||||
hostname = "{{ node_name }}"
|
||||
|
||||
input_defaults = {
|
||||
-- output_limit = 64 * 1024
|
||||
|
|
|
@ -6,4 +6,4 @@ afd_type = "node"
|
|||
afd_file = "afd_node_default_cpu_alarms"
|
||||
afd_cluster_name = "default"
|
||||
afd_logical_name = "cpu"
|
||||
hostname = "{{ CCP_HINDSIGHT_NODE_NAME }}"
|
||||
hostname = "{{ node_name }}"
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
filename = "kubelet_stats.lua"
|
||||
kubelet_stats_port = 10255
|
||||
kubelet_stats_node = "{{ CCP_HINDSIGHT_NODE_NAME }}"
|
||||
kubelet_stats_node = "{{ node_name }}"
|
||||
ticker_interval = 10
|
||||
|
|
|
@ -17,7 +17,7 @@
|
|||
},
|
||||
"tags": {
|
||||
"/intel": {
|
||||
"hostname": "{{ CCP_SNAP_NODE_NAME }}"
|
||||
"hostname": "{{ node_name }}"
|
||||
}
|
||||
},
|
||||
"metrics": {
|
||||
|
|
|
@ -26,11 +26,6 @@ service:
|
|||
- name: stacklight-alarms
|
||||
type: empty-dir
|
||||
path: /opt/ccp/lua/modules/stacklight_alarms
|
||||
env:
|
||||
- name: CCP_HINDSIGHT_NODE_NAME
|
||||
valueFrom:
|
||||
fieldRef:
|
||||
fieldPath: spec.nodeName
|
||||
- name: snap
|
||||
image: snap
|
||||
probes:
|
||||
|
@ -51,11 +46,6 @@ service:
|
|||
type: host
|
||||
path: /dev
|
||||
mount-path: /host-dev
|
||||
env:
|
||||
- name: CCP_SNAP_NODE_NAME
|
||||
valueFrom:
|
||||
fieldRef:
|
||||
fieldPath: spec.nodeName
|
||||
- name: alarm-manager
|
||||
image: alarm-manager
|
||||
probes:
|
||||
|
@ -73,11 +63,6 @@ service:
|
|||
- name: stacklight-alarms
|
||||
type: empty-dir
|
||||
path: /opt/ccp/lua/modules/stacklight_alarms
|
||||
env:
|
||||
- name: CCP_ALERT_MANAGER_NODE_NAME
|
||||
valueFrom:
|
||||
fieldRef:
|
||||
fieldPath: spec.nodeName
|
||||
files:
|
||||
hindsight.cfg:
|
||||
path: /etc/hindsight/hindsight.cfg
|
||||
|
|
Loading…
Reference in New Issue