修改tsg_9140_system_init相关配置文件

tsg-9140-scripts/install_config/group_vars/tsg_9140_docker.yml

@@ -28,10 +28,10 @@ breakpad_upload_url: http://127.0.0.1:9000/api/2/minidump/?sentry_key=3556bac347
 inline_device_config:
   keepalive_ip: 10.254.19.1
   keepalive_mask: 255.255.255.252
-  data_incoming: enp131s0f3
+  data_incoming: enp130s2f3
 
 nic_mgr:
-  name: enp131s0f3
+  name: enp130s2f3
 
 kni_log_level: 10
 

tsg-9140-scripts/install_config/tsg_9140_host

@@ -1,6 +1,2 @@
-[tsg_9140]
-centos7 ansible_connection=docker
-[tsg_9140_init]
-127.0.0.1
 [tsg_9140_chroot]
-centos_mkroot/  ansible_connection=chroot
+/root/geedge-work/onie-5-10/tsg-os-installer/build/9000-NPB-P01R01/sysroot  ansible_connection=chroot

tsg-9140-scripts/roles/firewall/templates/main.conf.j2.j2

@@ -39,7 +39,7 @@ IP_ADDR_TABLE="TSG_SECURITY_ADDR"
 
 [TSG_LOG]
 MODE=1
-NIC_NAME="enp131s0f3"
+NIC_NAME="enp130s2f3"
 MAX_SERVICE=1
 LOG_LEVEL=30
 LOG_PATH="./tsglog/tsglog"
@@ -100,4 +100,4 @@ PUBLISH_TOPIC="APP_SIGNATURE_ID"
 #CLIENT_ID=
 {% raw %}
 BROKER_LIST="{{ firewall.APP_SKETCH_BROKER_LIST }}"
-{% endraw %}
+{% endraw %}

tsg-9140-scripts/roles/kni/templates/kni.conf.j2

@@ -2,23 +2,23 @@
 log_path = ./log/kni/kni.log
 log_level = 30
 tfe_node_count = 1
-manage_eth = enp131s0f3
+manage_eth = enp130s2f3
 deploy_mode = normal
 tun_name = tun_kni
 src_mac_addr = 00:0e:c6:d6:72:c1
 dst_mac_addr = fe:65:b7:03:50:bd
 [tfe0]
 enabled = 1
-dev_eth_symbol = enp1s2f1
+dev_eth_symbol = enp130s2
 ip_addr = 192.168.100.1
 
 [tfe_cmsg_receiver]
-listen_eth = enp131s0f3.100
+listen_eth = enp1s2f1
 listen_port = 2475
 
 [watch_dog]
 switch = 1
-listen_eth = enp131s0f3.100
+listen_eth = enp1s2f1
 listen_port = 2476
 keepalive_idle = 2
 keepalive_intvl = 1

tsg-9140-scripts/roles/system-init/files/tsg-9140-init/install_config/tsg_9140_host

@@ -1,2 +1,2 @@
 [tsg_9140_init]
-127.0.0.1
+127.0.0.1 ansible_connection=local

tsg-9140-scripts/roles/system-init/files/tsg-9140-init/roles/tsg_9140_system_init/tasks/main.yml

@@ -1,69 +1,36 @@
 ---
-##################### kernel #####################
-
-- name: "set kernel-ml as default kernel"
-  command: /usr/sbin/grub2-set-default 0
-#  when: t_kernel_ml.changed
-
-- name: "copy /etc/default/grub"
-  copy:
-    src: "{{ role_path }}/files/grub"
-    dest: "/etc/default"
-#  when:
-#    - tsg_access_type == 4 or tsg_access_type == 5
-#    - t_kernel_ml.changed
-
-- name: "BIOS:grub2-mkconfig"
-  shell: grub2-mkconfig -o /boot/grub2/grub.cfg
-#  when:
-#    - tsg_access_type == 4 or tsg_access_type == 5
-#    - t_kernel_ml.changed
-
-- name: "UEFI:grub2-mkconfig"
-  shell: grub2-mkconfig  -o /boot/efi/EFI/centos/grub.cfg
-#  when:
-#    - tsg_access_type == 4 or tsg_access_type == 5
-#    - t_kernel_ml.changed
-
-
 ##################### mrzcpd #####################
 - name: "enable mrenv"
   systemd:
     name: mrenv
     enabled: yes
-    daemon_reload: yes
 
 - name: "enable mrzcpd"
   systemd:
     name: mrzcpd
     enabled: yes
-    daemon_reload: yes
 
 - name: "enable prometheus output - monit_device"
   systemd:
     name: mrapm_device
     enabled: yes
-    daemon_reload: yes
 
 - name: "enable prometheus output - monit_stream"
   systemd:
     name: mrapm_stream
     enabled: yes
-    daemon_reload: yes
 
 ##################### sapp #####################
 - name: "enable sapp"
   systemd:
     name: sapp
     enabled: yes
-    daemon_reload: yes
 
 ##################### kni #####################
 - name: "enable sapp"
   systemd:
     name: sapp
     enabled: yes
-    daemon_reload: yes
 
 ##################### certstore #####################
 - name: "start certstore"
@@ -71,14 +38,12 @@
     name: certstore.service
     state: started
     enabled: yes
-    daemon_reload: yes
 
 ##################### cert-redis #####################
 - name: "start cert-redis"
   systemd:
     name: cert-redis.service
     state: started
-    daemon_reload: yes
     enabled: yes
 
 ##################### tfe #####################
@@ -86,13 +51,11 @@
   systemd:
     name: tfe-env
     enabled: yes
-    daemon_reload: yes
 
 - name: "enable tfe"
   systemd:
     name: tfe
     enabled: yes
-    daemon_reload: yes
 
 ##################### telegraf #####################
 - name: "Start telegraf"
@@ -100,33 +63,28 @@
     name: telegraf_statistic.service
     state: started
     enabled: yes
-    daemon_reload: yes
 
 ##################### exporter #####################
-- name: 'atca-exporter-node service start'
+- name: 'exporter-node service start'
   systemd:
-    name: atca-exporter-node
+    name: exporter-node
     enabled: yes
-    daemon_reload: yes
     state: started
 
-- name: 'atca-exporter-systemd service start'
+- name: 'exporter-systemd service start'
   systemd:
-    name: atca-exporter-systemd
+    name: exporter-systemd
     enabled: yes
-    daemon_reload: yes
     state: restarted
 
-- name: 'atca-exporter-ipmi service start'
+- name: 'exporter-ipmi service start'
   systemd:
-    name: atca-exporter-ipmi
+    name: exporter-ipmi
     enabled: yes
-    daemon_reload: yes
     state: restarted
 ##################### Tsg-diagnose #####################
 - name: 'Tsg-diagnose service start'
   systemd:
     name: tsg-diagnose
     enabled: yes
-    daemon_reload: yes
     state: started

tsg-9140-scripts/roles/tfe/templates/tfe-env-config.j2

@@ -4,5 +4,5 @@ TFE_PEER_MAC_DATA_INCOMING=00:0e:c6:d6:72:c1
 TFE_LOCAL_IP_DATA_INCOMING=172.16.241.2
 TFE_PEER_IP_DATA_INCOMING=172.16.241.1
 
-TFE_WATCHDOG_DEVICE=enp131s0f3.100
+TFE_WATCHDOG_DEVICE=enp130s2f3.100
 TFE_WATCHDOG_IP=192.168.100.1