diff --git a/installer/install.sh b/installer/install.sh index 60b0b4a8..8d5a1201 100755 --- a/installer/install.sh +++ b/installer/install.sh @@ -21,8 +21,8 @@ exp_part_tsg_os_sysroot_primary=5 exp_part_tsg_os_sysroot_secondry=6 size_part_tsg_os_config="128M" size_part_tsg_os_data="128M" -size_part_tsg_os_sysroot_primary="4096M" -size_part_tsg_os_sysroot_secondry="2048M" +size_part_tsg_os_sysroot_primary="6096M" +size_part_tsg_os_sysroot_secondry="48M" dev_part_tsg_os_sysroot_primary="/dev/sda${exp_part_tsg_os_sysroot_primary}" dev_part_tsg_os_sysroot_secondry="/dev/sda${exp_part_tsg_os_sysroot_secondry}" dev_part_tsg_os_config="/dev/sda${exp_part_tsg_os_config}" @@ -43,7 +43,7 @@ check_is_upgrade() { elif [ "$part_tsg_os_sysroot_primary" != "$exp_part_tsg_os_sysroot_primary" ]; then return 1 elif [ "$part_tsg_os_sysroot_secondry" != "$exp_part_tsg_os_sysroot_secondry" ]; then return 1 fi - + return 0 } @@ -120,7 +120,7 @@ cd $(dirname $0) if check_is_upgrade; then echo "Upgrading TSG-OS, the config and data partitions will be keeped in $blk_dev." - + format_sysroot_partitions || { echo "ERROR: Unable to format sysroot partition on $blk_dev, TSG-OS install failed." exit 1 diff --git a/mkimage-yum.sh b/mkimage-yum.sh index c30c0f58..5f5a5e8a 100755 --- a/mkimage-yum.sh +++ b/mkimage-yum.sh @@ -52,7 +52,7 @@ done package_to_install="@base @core @debugging @directory-client @guest-agents @hardware-monitoring @network-file-system-client @performance @remote-system-management - grub2 kernel kernel-devel" + grub2 kernel kernel-devel epel-release ansible" setopt="group_package_types=mandatory,default,optional" @@ -99,8 +99,12 @@ fi #tar --numeric-owner -c -C "$target" . | docker import - $name:$version #docker run -i -t $name:$version echo success -ansible-playbook -i /root/tsg-9140-scripts/install_config/tsg_9140_host /root/tsg-9140-scripts/tsg_9140_deploy.yml +cp -a /dev/urandom centos_mkroot/dev/ +cp -a /dev/random centos_mkroot/dev/ +#tar zcvf centos_mkroot.tar.gz centos_mkroot/ +ansible-playbook -i tsg-9140-scripts/install_config/tsg_9140_host tsg-9140-scripts/tsg_9140_deploy.yml yum -c "$yum_config" --installroot="$target" -y --setopt=$setopt clean all +rm -rf centos_mkroot/tmp/* tar --numeric-owner -c -C centos_mkroot/ . | bzip2 > input/centos-7-chroot.tar.bz2 #rm -rf "$target" diff --git a/tsg-9140-scripts/install_config/tsg_9140_host b/tsg-9140-scripts/install_config/tsg_9140_host index 19b71132..8fa28375 100644 --- a/tsg-9140-scripts/install_config/tsg_9140_host +++ b/tsg-9140-scripts/install_config/tsg_9140_host @@ -1,6 +1,6 @@ [tsg_9140] centos7 ansible_connection=docker [tsg_9140_init] -192.168.40.85 +127.0.0.1 [tsg_9140_chroot] -/root/geedge-work/tsg-os-installer/centos_mkroot/ ansible_connection=chroot \ No newline at end of file +centos_mkroot/ ansible_connection=chroot diff --git a/tsg-9140-scripts/roles/cert-redis/tasks/main.yml b/tsg-9140-scripts/roles/cert-redis/tasks/main.yml index 1ea276c2..2ad0eb0b 100644 --- a/tsg-9140-scripts/roles/cert-redis/tasks/main.yml +++ b/tsg-9140-scripts/roles/cert-redis/tasks/main.yml @@ -4,13 +4,6 @@ dest: "{{ item.dest }}" mode: "{{ item.mode }}" with_items: - - { src: "cert-redis.conf" , dest: "/etc" , mode: "0644" } + - { src: "cert-redis.conf" , dest: "/etc" , mode: "0644" } - { src: "cert-redis.service" , dest: "/usr/lib/systemd/system" , mode: "0644" } -#- name: "start cert-redis" -# systemd: -# -# name: cert-redis.service -# state: started -# daemon_reload: yes -# enabled: yes diff --git a/tsg-9140-scripts/roles/certstore/tasks/main.yml b/tsg-9140-scripts/roles/certstore/tasks/main.yml index 855ade6b..fa91fb50 100644 --- a/tsg-9140-scripts/roles/certstore/tasks/main.yml +++ b/tsg-9140-scripts/roles/certstore/tasks/main.yml @@ -29,9 +29,4 @@ dest: /etc/systemd/system/certstore.service.d/ mode: 0644 -#- name: "start certstore" -# systemd: -# name: certstore.service -# state: started -# enabled: yes -# daemon_reload: yes + diff --git a/tsg-9140-scripts/roles/exporter/tasks/main.yml b/tsg-9140-scripts/roles/exporter/tasks/main.yml index f8ce72d6..e396c18e 100644 --- a/tsg-9140-scripts/roles/exporter/tasks/main.yml +++ b/tsg-9140-scripts/roles/exporter/tasks/main.yml @@ -50,23 +50,4 @@ dest: /usr/lib/systemd/system/exporter-ipmi.service tags: template -#- name: 'atca-exporter-node service start' -# systemd: -# name: atca-exporter-node -# enabled: yes -# daemon_reload: yes -# state: started -# -#- name: 'atca-exporter-systemd service start' -# systemd: -# name: atca-exporter-systemd -# enabled: yes -# daemon_reload: yes -# state: restarted -# -#- name: 'atca-exporter-ipmi service start' -# systemd: -# name: atca-exporter-ipmi -# enabled: yes -# daemon_reload: yes -# state: restarted + diff --git a/tsg-9140-scripts/roles/kni/tasks/main.yml b/tsg-9140-scripts/roles/kni/tasks/main.yml index b817c7d5..c6da3604 100644 --- a/tsg-9140-scripts/roles/kni/tasks/main.yml +++ b/tsg-9140-scripts/roles/kni/tasks/main.yml @@ -17,8 +17,4 @@ dest: /home/mesasoft/sapp_run/etc/kni/kni.conf tags: template -#- name: "enable sapp" -# systemd: -# name: sapp -# enabled: yes -# daemon_reload: yes + diff --git a/tsg-9140-scripts/roles/sapp/tasks/main.yml b/tsg-9140-scripts/roles/sapp/tasks/main.yml index 78aad32d..474d10dc 100644 --- a/tsg-9140-scripts/roles/sapp/tasks/main.yml +++ b/tsg-9140-scripts/roles/sapp/tasks/main.yml @@ -15,7 +15,7 @@ name: - /tmp/ansible_deploy/sapp-4.2.26.fc1a6aa-2.el7.x86_64.rpm state: present - + - name: "install tcpdump_mesa rpms from localhost" yum: name: @@ -58,19 +58,6 @@ dest: /etc/tmpfiles.d/sapp_tmpfile.conf tags: template -#- name: Template the gdev.conf -# template: -# src: "{{ role_path }}/templates/gdev.conf.j2" -# dest: /home/mesasoft/sapp_run/etc/gdev.conf -# when: tsg_access_type == 1 -# -#- name: Template the vlan_flipping_map.conf -# template: -# src: "{{ role_path }}/templates/vlan_flipping_map.conf.j2" -# dest: /home/mesasoft/sapp_run/etc/vlan_flipping_map.conf -# when: tsg_access_type == 2 - - - name: "Template sapp.service destination server" template: src: "{{ role_path }}/templates/sapp.service.j2" @@ -83,22 +70,3 @@ dest: /etc/systemd/system/sapp.service.d/ mode: 0644 -#- name: "copy fake promisc tools for tera mode - service file" -# copy: -# src: "{{ role_path }}/files/tera_fake_promisc_setup.conf" -# dest: /etc/systemd/system/sapp.service.d/ -# mode: 0644 -# when: tsg_access_type == 2 -# -#- name: "copy fake promisc tools for tera mode - scripts" -# copy: -# src: "{{ role_path }}/files/tera_fake_promisc_setup.sh" -# dest: /home/mesasoft/sapp_run/tera_fake_promisc_setup.sh -# mode: 0755 -# when: tsg_access_type == 2 -# -#- name: "enable sapp" -# systemd: -# name: sapp -# enabled: yes -# daemon_reload: yes diff --git a/tsg-9140-scripts/roles/system-init/files/tsg-9140-init/install_config/tsg_9140_host b/tsg-9140-scripts/roles/system-init/files/tsg-9140-init/install_config/tsg_9140_host new file mode 100644 index 00000000..e846de17 --- /dev/null +++ b/tsg-9140-scripts/roles/system-init/files/tsg-9140-init/install_config/tsg_9140_host @@ -0,0 +1,2 @@ +[tsg_9140_init] +127.0.0.1 \ No newline at end of file diff --git a/tsg-9140-scripts/roles/system-init/files/tsg-9140-init/roles/tsg_9140_system_init/files/grub b/tsg-9140-scripts/roles/system-init/files/tsg-9140-init/roles/tsg_9140_system_init/files/grub new file mode 100644 index 00000000..0bb60ade --- /dev/null +++ b/tsg-9140-scripts/roles/system-init/files/tsg-9140-init/roles/tsg_9140_system_init/files/grub @@ -0,0 +1,8 @@ +GRUB_TIMEOUT=5 +GRUB_DISTRIBUTOR="$(sed 's, release .*$,,g' /etc/system-release)" +GRUB_DEFAULT=saved +GRUB_DISABLE_SUBMENU=true +GRUB_TERMINAL="serial console" +GRUB_SERIAL_COMMAND="serial --speed=115200" +GRUB_CMDLINE_LINUX="crashkernel=auto console=ttyS0,115200 intel_iommu=on iommu=pt pci=realloc,assign-busses" +GRUB_DISABLE_RECOVERY="true" diff --git a/tsg-9140-scripts/roles/system-init/files/tsg-9140-init/roles/tsg_9140_system_init/tasks/main.yml b/tsg-9140-scripts/roles/system-init/files/tsg-9140-init/roles/tsg_9140_system_init/tasks/main.yml new file mode 100644 index 00000000..e0838173 --- /dev/null +++ b/tsg-9140-scripts/roles/system-init/files/tsg-9140-init/roles/tsg_9140_system_init/tasks/main.yml @@ -0,0 +1,132 @@ +--- +##################### 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" + systemd: + 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 ##################### +- name: "enable tfe-env" + systemd: + name: tfe-env + enabled: yes + daemon_reload: yes + +- name: "enable tfe" + systemd: + name: tfe + enabled: yes + daemon_reload: yes + +##################### telegraf ##################### +- name: "Start telegraf" + systemd: + name: telegraf_statistic.service + state: started + enabled: yes + daemon_reload: yes + +##################### exporter ##################### +- name: 'atca-exporter-node service start' + systemd: + name: atca-exporter-node + enabled: yes + daemon_reload: yes + state: started + +- name: 'atca-exporter-systemd service start' + systemd: + name: atca-exporter-systemd + enabled: yes + daemon_reload: yes + state: restarted + +- name: 'atca-exporter-ipmi service start' + systemd: + name: atca-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 \ No newline at end of file diff --git a/tsg-9140-scripts/roles/system-init/files/tsg-9140-init/tsg_9140_init.yml b/tsg-9140-scripts/roles/system-init/files/tsg-9140-init/tsg_9140_init.yml new file mode 100644 index 00000000..1d0eb52a --- /dev/null +++ b/tsg-9140-scripts/roles/system-init/files/tsg-9140-init/tsg_9140_init.yml @@ -0,0 +1,4 @@ +- hosts: tsg_9140_init + remote_user: root + roles: + - {role: tsg_9140_system_init, tags: tsg_9140_system_init} \ No newline at end of file diff --git a/tsg-9140-scripts/roles/system-init/tasks/main.yml b/tsg-9140-scripts/roles/system-init/tasks/main.yml index 1912a4e3..bebba442 100644 --- a/tsg-9140-scripts/roles/system-init/tasks/main.yml +++ b/tsg-9140-scripts/roles/system-init/tasks/main.yml @@ -1,23 +1,4 @@ --- -- name: "get slot info" - shell: ipmitool picmg addrinfo - register: slot_info - ignore_errors: True - -- debug: - var: slot_info - -- name: "echo slot info" - shell: /bin/echo "{{ "192.168.1." }}" > /root/1.txt - -- name: "set atca interior netwok ip addr" - vars: - ipaddr: "{{ slot_info.stdout_lines[0][22] | int + 16}}" - template: - src: "{{ role_path }}/templates/ifcfg-enp131s0f0.toml.j2" - dest: /etc/sysconfig/network-scripts/ifcfg-enp131s0f0 - tags: template - - name: "set enp1s0 up and NM_CONTROLLED=no" template: src: "{{ role_path }}/templates/ifcfg-enp1s0.toml.j2" @@ -43,3 +24,10 @@ dest: /sbin/ifdown-local mode: 0777 tags: template + +- name: "copy tsg_9140_system_init" + copy: + src: "{{ role_path }}/files/" + dest: /root/ + + diff --git a/tsg-9140-scripts/roles/system-init/templates/ifcfg-enp131s0f0.toml.j2 b/tsg-9140-scripts/roles/system-init/templates/ifcfg-enp131s0f0.toml.j2 deleted file mode 100644 index 49ce4849..00000000 --- a/tsg-9140-scripts/roles/system-init/templates/ifcfg-enp131s0f0.toml.j2 +++ /dev/null @@ -1,17 +0,0 @@ -TYPE=Ethernet -PROXY_METHOD=none -BROWSER_ONLY=no -BOOTPROTO=static -DEFROUTE=yes -IPV4_FAILURE_FATAL=no -IPV6INIT=yes -IPV6_AUTOCONF=yes -IPV6_DEFROUTE=yes -IPV6_FAILURE_FATAL=no -IPV6_ADDR_GEN_MODE=stable-privacy -NAME=enp131s0f0 -DEVICE=enp131s0f0 -ONBOOT=yes -IPADDR={{ "10.254." ~ ipaddr ~ ".1" }} -NETMASK=255.255.0.0 -GATEWAY=10.254.17.1 \ No newline at end of file diff --git a/tsg-9140-scripts/roles/system-init/templates/ifdown-local.toml.j2 b/tsg-9140-scripts/roles/system-init/templates/ifdown-local.toml.j2 index edb06a91..f71a0c94 100644 --- a/tsg-9140-scripts/roles/system-init/templates/ifdown-local.toml.j2 +++ b/tsg-9140-scripts/roles/system-init/templates/ifdown-local.toml.j2 @@ -1,10 +1,16 @@ #!/bin/sh IN="$1" -if [ "$1" == "enp130s0" ] +if [ "$1" == "enp1s0" ] then logger "$0: Interface $1 Down,Rmove $1 VF And Vlan ..." echo 0 >/sys/class/net/enp1s0/device/sriov_numvfs +elif [ "$1" == "enp130s0" ] +then +logger "$0: Interface $1 Down,Rmove $1 VF And Vlan ..." echo 0 > /sys/class/net/enp130s0/device/sriov_numvfs +elif [ "$1" == "enp131s0f0" ] +then +logger "$0: Interface $1 Down" fi exit 0 \ No newline at end of file diff --git a/tsg-9140-scripts/roles/system-init/templates/ifup-local.toml.j2 b/tsg-9140-scripts/roles/system-init/templates/ifup-local.toml.j2 index 47ed1a6e..6c9a29fb 100644 --- a/tsg-9140-scripts/roles/system-init/templates/ifup-local.toml.j2 +++ b/tsg-9140-scripts/roles/system-init/templates/ifup-local.toml.j2 @@ -1,15 +1,11 @@ #!/bin/sh IN="$1" -if [ "$1" == "enp130s0" ] +if [ "$1" == "enp1s0" ] then logger "$0: Interface $1 UP,Set $1 VF And Vlan ..." modprobe 8021q -#vconfig add enp131s0f3 100 #不知道干啥的先注释 -#vconfig set_flag enp131s0f3.100 1 1 #不知道干啥的先注释 -#ifconfig enp131s0f3.100 192.168.100.1 netmask 255.255.255.0 up #不知道干啥的先注释 echo 3 > /sys/class/net/enp1s0/device/sriov_numvfs -echo 4 > /sys/class/net/enp130s0/device/sriov_numvfs sleep 0.5 echo add 0,3813,3814 > /sys/class/net/enp1s0/device/sriov/0/trunk ip link set enp1s0 vf 1 vlan 3813 @@ -18,6 +14,18 @@ ip link set enp1s0 vf 0 trust on ip link set enp1s0 vf 1 trust on ip link set enp1s0 vf 2 trust on ip link set enp1s0 vf 0 spoofchk off +ip link set enp1s0 vf 0 mac 00:0e:c6:d6:72:c1 +ip link set enp1s0 vf 1 mac fe:65:b7:03:50:bd +sleep 1 +ip link set enp1s2 up +ip link set enp1s2f1 up +ip link set enp1s2f2 up + +elif [ "$1" == "enp130s0" ] +then +logger "$0: Interface $1 UP,Set $1 VF And Vlan ..." +echo 4 > /sys/class/net/enp130s0/device/sriov_numvfs +sleep 0.5 ip link set enp130s0 vf 0 vlan 4095 ip link set enp130s0 vf 1 vlan 4095 ip link set enp130s0 vf 2 vlan 3816 @@ -26,16 +34,20 @@ ip link set enp130s0 vf 0 trust on ip link set enp130s0 vf 1 trust on ip link set enp130s0 vf 2 trust on ip link set enp130s0 vf 3 trust on -ip link set enp1s0 vf 0 mac 00:0e:c6:d6:72:c1 -ip link set enp1s0 vf 1 mac fe:65:b7:03:50:bd ip link set enp130s0 vf 0 spoofchk off sleep 1 -ip link set enp1s2 up -ip link set enp1s2f1 up -ip link set enp1s2f2 up ip link set enp130s2 up ip link set enp130s2f1 up ip link set enp130s2f2 up ip link set enp130s2f3 up +elif [ "$1" == "enp131s0f0" ] +then +output=$(ipmitool picmg addrinfo) +echo $output +substr=${output:22:1} +echo $substr +num=$((16#${substr}+16)) +ipaddr='10.254.'$num'.1' +ifconfig enp131s0f0 $ipaddr netmask 255.255.0.0 fi exit 0 \ No newline at end of file diff --git a/tsg-9140-scripts/roles/telegraf_statistic/tasks/main.yml b/tsg-9140-scripts/roles/telegraf_statistic/tasks/main.yml index a8499792..7a2dc2d0 100644 --- a/tsg-9140-scripts/roles/telegraf_statistic/tasks/main.yml +++ b/tsg-9140-scripts/roles/telegraf_statistic/tasks/main.yml @@ -21,9 +21,4 @@ dest: /usr/lib/systemd/system mode: 0644 -#- name: "Start telegraf" -# systemd: -# name: telegraf_statistic.service -# state: started -# enabled: yes -# daemon_reload: yes + diff --git a/tsg-9140-scripts/roles/tfe/tasks/main.yml b/tsg-9140-scripts/roles/tfe/tasks/main.yml index 342e127b..d1c9e0af 100644 --- a/tsg-9140-scripts/roles/tfe/tasks/main.yml +++ b/tsg-9140-scripts/roles/tfe/tasks/main.yml @@ -74,21 +74,4 @@ dest: /etc/systemd/system/tfe.service.d/ mode: 0644 -#- name: "enable tfe-env-tun-mode" -# systemd: -# name: tfe-env-tun-mode -# enabled: yes -# daemon_reload: yes -# when: tsg_running_type == 0 -# -#- name: "enable tfe-env" -# systemd: -# name: tfe-env -# enabled: yes -# daemon_reload: yes -# -#- name: "enable tfe" -# systemd: -# name: tfe -# enabled: yes -# daemon_reload: yes + diff --git a/tsg-9140-scripts/roles/tsg-diagnose/tasks/main.yml b/tsg-9140-scripts/roles/tsg-diagnose/tasks/main.yml index a8babf19..e8a2552a 100644 --- a/tsg-9140-scripts/roles/tsg-diagnose/tasks/main.yml +++ b/tsg-9140-scripts/roles/tsg-diagnose/tasks/main.yml @@ -27,12 +27,5 @@ dest: /opt/tsg/tsg-diagnose/.badssl_cert_dict remote_src: yes -#- name: 'Tsg-diagnose service start' -# systemd: -# name: tsg-diagnose -# enabled: yes -# daemon_reload: yes -# state: started - - name: "tsg-diagnose init rsync deamon" shell: /bin/sh /opt/tsg/tsg-diagnose/deploy/rsync/init_rsyncd.sh diff --git a/tsg-9140-scripts/tsg_9140_deploy.yml b/tsg-9140-scripts/tsg_9140_deploy.yml index b104f036..f79be2b9 100644 --- a/tsg-9140-scripts/tsg_9140_deploy.yml +++ b/tsg-9140-scripts/tsg_9140_deploy.yml @@ -22,4 +22,5 @@ - {role: tfe, tags: tfe} - {role: telegraf_statistic, tags: telegraf_statistic} - {role: exporter, tags: exporter} - - {role: tsg-diagnose, tags: tsg-diagnose} \ No newline at end of file + - {role: tsg-diagnose, tags: tsg-diagnose} + - {role: system-init, tags: system-init} \ No newline at end of file diff --git a/tsg-9140-scripts/tsg_9140_systen_init.yml b/tsg-9140-scripts/tsg_9140_systen_init.yml deleted file mode 100644 index cf5fcd69..00000000 --- a/tsg-9140-scripts/tsg_9140_systen_init.yml +++ /dev/null @@ -1,4 +0,0 @@ -- hosts: tsg_9140_init - remote_user: root - roles: - - {role: system-init, tags: system-init} \ No newline at end of file