From 0a3fa3e0c873490109fd6daf361e889a0a11f112 Mon Sep 17 00:00:00 2001 From: fumingwei Date: Mon, 29 Aug 2022 20:51:29 +0800 Subject: [PATCH] =?UTF-8?q?bugfix:=E4=BF=AE=E6=94=B9init=E5=AE=B9=E5=99=A8?= =?UTF-8?q?=E7=94=B1=E6=89=A7=E8=A1=8Cansible=E8=84=9A=E6=9C=AC=E5=8F=98?= =?UTF-8?q?=E4=B8=BAshell=E8=84=9A=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ansible/HAL_deploy.yml | 1 - .../container-tools-install/tasks/main.yml | 23 ------------------ .../files/helm/conf/provision-init.sh | 16 +++++++++++++ .../files/helm/conf/provision.yml | 24 ------------------- .../files/helm/templates/provision.yaml | 2 +- .../files/helm/templates/traffic-engine.yaml | 7 +++--- 6 files changed, 21 insertions(+), 52 deletions(-) create mode 100644 ansible/roles/traffic-engine/files/helm/conf/provision-init.sh delete mode 100644 ansible/roles/traffic-engine/files/helm/conf/provision.yml diff --git a/ansible/HAL_deploy.yml b/ansible/HAL_deploy.yml index 06b71604..a7717bbc 100644 --- a/ansible/HAL_deploy.yml +++ b/ansible/HAL_deploy.yml @@ -166,7 +166,6 @@ - install_config/group_vars/HAL_TSGXNXR620G40R01P0906.yml - install_config/group_vars/rpm_version.yml roles: - - {role: tsg-os-provision, tags: tsg-os-provision} - {role: container-tools-install, tags: container-tools-install} - {role: tsg_sn, tags: tsg_sn} diff --git a/ansible/roles/container-tools-install/tasks/main.yml b/ansible/roles/container-tools-install/tasks/main.yml index c806cd11..fddba411 100644 --- a/ansible/roles/container-tools-install/tasks/main.yml +++ b/ansible/roles/container-tools-install/tasks/main.yml @@ -1,26 +1,3 @@ -- name: "install ansible" - yum: - name: ansible - conf_file: "{{ rpm_repo_config_path }}" - state: present - when: PROFILE_ID == 'TSG-X-NXR620G40-R01-P0906-init' - -- name: "Generate ansiblg.cfg after ansible upgrade in rockylinux8" - shell: ansible-config init --disabled > /etc/ansible/ansible.cfg - when: PROFILE_ID == 'TSG-X-NXR620G40-R01-P0906-init' - -- name: 'change ansible hash_behaviour value replace to merge' - lineinfile: - path: /etc/ansible/ansible.cfg - backrefs: yes - regexp: "^(.*hash_behaviour.*=.*replace.*)$" - line: '\1\nhash_behaviour = merge' - when: PROFILE_ID == 'TSG-X-NXR620G40-R01-P0906-init' - -- name: 'install psutil' - shell: pip3 install -i https://pypi.tuna.tsinghua.edu.cn/simple psutil - when: PROFILE_ID == 'TSG-X-NXR620G40-R01-P0906-init' - - name: "install tcpdump" yum: name: tcpdump diff --git a/ansible/roles/traffic-engine/files/helm/conf/provision-init.sh b/ansible/roles/traffic-engine/files/helm/conf/provision-init.sh new file mode 100644 index 00000000..c3bd8525 --- /dev/null +++ b/ansible/roles/traffic-engine/files/helm/conf/provision-init.sh @@ -0,0 +1,16 @@ +#!/bin/bash -ex + +mkdir -p /target_config/opt/tsg/etc +mkdir -p /target_config/etc/default +chmod 0755 /opt/tsg/tsg-os-provision/scripts/obtain_sn.sh +/opt/tsg/tsg-os-provision/scripts/obtain_sn.sh +ip tuntap add mode tap ctrl_mock +ifconfig ctrl_mock up +ifconfig ctrl_mock $NODE_IP/32 +ifconfig ctrl_mock mtu 2000 +{{ if eq .Values.proxy.enable .Values.define_enable_val_yes }} +ip tuntap add dev tap0 mode tap multi_queue +chmod 0755 /opt/tsg/tfe/tfe-env-start.sh +/opt/tsg/tfe/tfe-env-start.sh +{{- end }} +mount -o remount,rw /sys \ No newline at end of file diff --git a/ansible/roles/traffic-engine/files/helm/conf/provision.yml b/ansible/roles/traffic-engine/files/helm/conf/provision.yml deleted file mode 100644 index 41d8ea12..00000000 --- a/ansible/roles/traffic-engine/files/helm/conf/provision.yml +++ /dev/null @@ -1,24 +0,0 @@ ---- -- hosts: provision - tasks: - - name: "mkdir /opt/tsg/exporter/" - file: - path: {{`"{{ item }}"`}} - state: directory - with_items: - - /target_config/opt/tsg/etc - - /target_config/etc/default - - - name: "get sn" - shell: /opt/tsg/tsg-os-provision/scripts/obtain_sn.sh - - - name: "create tap device ctrl_mock" - shell: ip tuntap add mode tap ctrl_mock; ifconfig ctrl_mock up; ifconfig ctrl_mock $NODE_IP/32; ifconfig ctrl_mock mtu 2000 - -{{ if eq .Values.proxy.enable .Values.define_enable_val_yes }} - - name: "create tap device tap0" - shell: ip tuntap add dev tap0 mode tap multi_queue - - - name: "execute tfe-env shell" - shell: /opt/tsg/tfe/tfe-env-start.sh -{{- end }} diff --git a/ansible/roles/traffic-engine/files/helm/templates/provision.yaml b/ansible/roles/traffic-engine/files/helm/templates/provision.yaml index c0a2fc98..f475ce43 100644 --- a/ansible/roles/traffic-engine/files/helm/templates/provision.yaml +++ b/ansible/roles/traffic-engine/files/helm/templates/provision.yaml @@ -4,4 +4,4 @@ metadata: name: provisioninit-{{ .Release.Name }} namespace: default data: - provision.yml: {{ tpl (.Files.Get "conf/provision.yml") . | quote }} + provision-init.sh: {{ tpl (.Files.Get "conf/provision-init.sh") . | quote }} diff --git a/ansible/roles/traffic-engine/files/helm/templates/traffic-engine.yaml b/ansible/roles/traffic-engine/files/helm/templates/traffic-engine.yaml index c1ea8e8f..d98576b1 100644 --- a/ansible/roles/traffic-engine/files/helm/templates/traffic-engine.yaml +++ b/ansible/roles/traffic-engine/files/helm/templates/traffic-engine.yaml @@ -175,7 +175,7 @@ spec: - name: tsg-init image: docker.io/library/tsg-init:{{ .Chart.AppVersion }} imagePullPolicy: Never - command: ["/bin/bash","-c","ansible-playbook -i /opt/tsg/tsg-os-provision/hosts /opt/tsg/tsg-os-provision/tasks/provision.yml ; mount -o remount,rw /sys"] + command: ["/bin/bash","-c","/opt/tsg/provision-init.sh"] securityContext: privileged: true env: @@ -185,8 +185,8 @@ spec: fieldPath: status.hostIP volumeMounts: - name: provisioninit - mountPath: "/opt/tsg/tsg-os-provision/tasks/provision.yml" - subPath: "provision.yml" + mountPath: "/opt/tsg/provision-init.sh" + subPath: "provision-init.sh" - name: config-volume mountPath: /target_config @@ -217,6 +217,7 @@ spec: name: sapp-{{ .Release.Name }} - name: provisioninit configMap: + defaultMode: 493 name: provisioninit-{{ .Release.Name }} - name: config-volume emptyDir: {}