feat: 更新tsg-os-mgnt-srv到1.0.38

TSG-14740 增加interactive startup等调试选项
TSG-15171 调整mrzcpd和k3s服务启动顺序
This commit is contained in:
wangmenglan
2023-05-17 19:02:47 +08:00
committed by 付明卫
parent 3056f8963f
commit 26f2f1ef35
4 changed files with 17 additions and 5 deletions

View File

@@ -101,7 +101,7 @@ hasp_update_rpm_version:
tsg_os_clixon_rpm_version:
cligen: cligen-5.8.0-release
clixon: clixon-5.8.0-release
tsg-os-mgnt-srv: tsg-os-mgnt-srv-1.0.37.fe91fe7
tsg-os-mgnt-srv: tsg-os-mgnt-srv-1.0.38.74d6997
sce_rpm_version:
sce: sce-1.0.11.79e71c4

View File

@@ -17,10 +17,10 @@
- name: "execute k3s install"
shell: curl -sfL https://get.k3s.io | INSTALL_K3S_SKIP_DOWNLOAD=true INSTALL_K3S_SKIP_ENABLE=true INSTALL_K3S_BIN_DIR=/usr/bin sh -s - --flannel-backend=none
- name: "enable k3s"
systemd:
name: k3s
enabled: yes
# - name: "enable k3s"
# systemd:
# name: k3s
# enabled: yes
- name: "kubectl bash auto-completion"
shell: kubectl completion bash | sudo tee /etc/bash_completion.d/kubectl > /dev/null

View File

@@ -188,13 +188,16 @@
systemd:
name: mrzcpd
enabled: yes
when: runtime_env != 'TSG-X-P0906'
- name: "enable prometheus output - monit_device"
systemd:
name: mrapm_device
enabled: yes
when: runtime_env != 'TSG-X-P0906'
- name: "enable prometheus output - monit_stream"
systemd:
name: mrapm_stream
enabled: yes
when: runtime_env != 'TSG-X-P0906'

View File

@@ -97,8 +97,17 @@ set_os_hugepages()
return 0
}
set_bridge()
{
ip link add br_dign_c type bridge
ip link add br_dign_s type bridge
ip link set br_dign_c up
ip link set br_dign_s up
}
load_tsg_os_HAL_config || set_resouce_by_HAL ${mem_num} ${cpu_core_num}
set_k3s_config ${mem_num}
set_tsg_clixon_conf
set_os_hugepages
set_bridge