gfwleak/tsg-tsg-os-buildimage
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改 PROFILE_ID; 合并冗余的 ansible-stage-one-7400 文件

Browse Source
This commit is contained in:
luwenpeng
2021-06-01 15:39:41 +08:00
parent b4e0fa4e02
commit cf9d6baf4d
9 changed files with 17 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ansible/tsg_7400_deploy.yml
View File

@@ -1,4 +1,4 @@
- hosts: tsg_7400_chroot_mcn0
- hosts: 7400-MCN0-P01R01
remote_user: root
vars_files:
- install_config/group_vars/tsg_7400_docker.yml
@@ -7,7 +7,7 @@
- {role: tsg-os-provision, tags: tsg-os-provision}
- {role: system-init-7400-mcn0, tags: system-init-7400-mcn0}
- hosts: tsg_7400_chroot_mcn1
- hosts: 7400-MCN1-P01R01
remote_user: root
vars_files:
- install_config/group_vars/tsg_7400_docker.yml
@@ -16,7 +16,7 @@
- {role: tsg-os-provision, tags: tsg-os-provision}
- {role: system-init-7400-mcn1, tags: system-init-7400-mcn1}
- hosts: tsg_7400_chroot_mcn2
- hosts: 7400-MCN2-P01R01
remote_user: root
vars_files:
- install_config/group_vars/tsg_7400_docker.yml
@@ -25,7 +25,7 @@
- {role: tsg-os-provision, tags: tsg-os-provision}
- {role: system-init-7400-mcn2, tags: system-init-7400-mcn2}
- hosts: tsg_7400_chroot_mcn3
- hosts: 7400-MCN3-P01R01
remote_user: root
vars_files:
- install_config/group_vars/tsg_7400_docker.yml

6
make/Makefile.7400MCN0P01R01
View File

@@ -1,6 +1,6 @@
PROFILE_ID := 7400-MCN-P01R01
SUPPORTED_MACHINE_ID := 7400-MCN-P01R01
PROFILE_ID := 7400-MCN0-P01R01
SUPPORTED_MACHINE_ID := 7400-MCN0-P01R01
KERNEL_ARGS := console=ttyS0,115200n8 crashkernel=auto intel_iommu=on iommu=pt pci=realloc,assign-busses
GRUB_SERIAL_COMMAND :=
SIZE_PART_SYSROOT := 16384M
@@ -50,7 +50,7 @@ sysroot-ansible: sysroot-verfile sysroot-base
cp $(CONFDIR)/resolv.conf $(TARGET_SYSROOT_DIR)/etc/ -r
cp $(TARGET_SYSROOT_DIR)/etc/hosts $(TARGET_SYSROOT_DIR)/tmp/ -r
cp /etc/hosts $(TARGET_SYSROOT_DIR)/etc/ -r
$(TOOLSDIR)/ansible-stage-one-7400-mcn0 $(PROFILE_ID) $(PROJECTDIR) $(TARGET_SYSROOT_DIR) /tmp/yum.conf
$(TOOLSDIR)/ansible-stage-one-7400 $(PROFILE_ID) $(PROJECTDIR) $(TARGET_SYSROOT_DIR) /tmp/yum.conf
cp $(TARGET_SYSROOT_DIR)/tmp/hosts $(TARGET_SYSROOT_DIR)/etc/ -r
sysroot-cleanup:

6
make/Makefile.7400MCN1P01R01
View File

@@ -1,6 +1,6 @@
PROFILE_ID := 7400-MCN-P01R01
SUPPORTED_MACHINE_ID := 7400-MCN-P01R01
PROFILE_ID := 7400-MCN1-P01R01
SUPPORTED_MACHINE_ID := 7400-MCN1-P01R01
KERNEL_ARGS := console=ttyS0,115200n8 crashkernel=auto intel_iommu=on iommu=pt pci=realloc,assign-busses
GRUB_SERIAL_COMMAND :=
SIZE_PART_SYSROOT := 16384M
@@ -50,7 +50,7 @@ sysroot-ansible: sysroot-verfile sysroot-base
cp $(CONFDIR)/resolv.conf $(TARGET_SYSROOT_DIR)/etc/ -r
cp $(TARGET_SYSROOT_DIR)/etc/hosts $(TARGET_SYSROOT_DIR)/tmp/ -r
cp /etc/hosts $(TARGET_SYSROOT_DIR)/etc/ -r
$(TOOLSDIR)/ansible-stage-one-7400-mcn1 $(PROFILE_ID) $(PROJECTDIR) $(TARGET_SYSROOT_DIR) /tmp/yum.conf
$(TOOLSDIR)/ansible-stage-one-7400 $(PROFILE_ID) $(PROJECTDIR) $(TARGET_SYSROOT_DIR) /tmp/yum.conf
cp $(TARGET_SYSROOT_DIR)/tmp/hosts $(TARGET_SYSROOT_DIR)/etc/ -r
sysroot-cleanup:

6
make/Makefile.7400MCN2P01R01
View File

@@ -1,6 +1,6 @@
PROFILE_ID := 7400-MCN-P01R01
SUPPORTED_MACHINE_ID := 7400-MCN-P01R01
PROFILE_ID := 7400-MCN2-P01R01
SUPPORTED_MACHINE_ID := 7400-MCN2-P01R01
KERNEL_ARGS := console=ttyS0,115200n8 crashkernel=auto intel_iommu=on iommu=pt pci=realloc,assign-busses
GRUB_SERIAL_COMMAND :=
SIZE_PART_SYSROOT := 16384M
@@ -50,7 +50,7 @@ sysroot-ansible: sysroot-verfile sysroot-base
cp $(CONFDIR)/resolv.conf $(TARGET_SYSROOT_DIR)/etc/ -r
cp $(TARGET_SYSROOT_DIR)/etc/hosts $(TARGET_SYSROOT_DIR)/tmp/ -r
cp /etc/hosts $(TARGET_SYSROOT_DIR)/etc/ -r
$(TOOLSDIR)/ansible-stage-one-7400-mcn2 $(PROFILE_ID) $(PROJECTDIR) $(TARGET_SYSROOT_DIR) /tmp/yum.conf
$(TOOLSDIR)/ansible-stage-one-7400 $(PROFILE_ID) $(PROJECTDIR) $(TARGET_SYSROOT_DIR) /tmp/yum.conf
cp $(TARGET_SYSROOT_DIR)/tmp/hosts $(TARGET_SYSROOT_DIR)/etc/ -r
sysroot-cleanup:

6
make/Makefile.7400MCN3P01R01
View File

@@ -1,6 +1,6 @@
PROFILE_ID := 7400-MCN-P01R01
SUPPORTED_MACHINE_ID := 7400-MCN-P01R01
PROFILE_ID := 7400-MCN3-P01R01
SUPPORTED_MACHINE_ID := 7400-MCN3-P01R01
KERNEL_ARGS := console=ttyS0,115200n8 crashkernel=auto intel_iommu=on iommu=pt pci=realloc,assign-busses
GRUB_SERIAL_COMMAND :=
SIZE_PART_SYSROOT := 16384M
@@ -50,7 +50,7 @@ sysroot-ansible: sysroot-verfile sysroot-base
cp $(CONFDIR)/resolv.conf $(TARGET_SYSROOT_DIR)/etc/ -r
cp $(TARGET_SYSROOT_DIR)/etc/hosts $(TARGET_SYSROOT_DIR)/tmp/ -r
cp /etc/hosts $(TARGET_SYSROOT_DIR)/etc/ -r
$(TOOLSDIR)/ansible-stage-one-7400-mcn3 $(PROFILE_ID) $(PROJECTDIR) $(TARGET_SYSROOT_DIR) /tmp/yum.conf
$(TOOLSDIR)/ansible-stage-one-7400 $(PROFILE_ID) $(PROJECTDIR) $(TARGET_SYSROOT_DIR) /tmp/yum.conf
cp $(TARGET_SYSROOT_DIR)/tmp/hosts $(TARGET_SYSROOT_DIR)/etc/ -r
sysroot-cleanup:

2
tools/ansible-stage-one-7400-mcn0 → tools/ansible-stage-one-7400
View File

@@ -8,7 +8,7 @@ YUM_CONF_PATH=$4
echo "----------------------------- Ansible Stage 1 ----------------------------"
echo "$PROFILE_ID"
echo "[tsg_7400_chroot_mcn0]" > $PROJECTDIR/ansible/install_config/tsg_7400_host
echo "[$PROFILE_ID]" > $PROJECTDIR/ansible/install_config/tsg_7400_host
echo "$TARGET_SYSROOT_DIR ansible_connection=chroot" >> $PROJECTDIR/ansible/install_config/tsg_7400_host
ansible-playbook -i $PROJECTDIR/ansible/install_config/tsg_7400_host $PROJECTDIR/ansible/tsg_7400_deploy.yml -e "rpm_repo_config_path=$YUM_CONF_PATH"

14
tools/ansible-stage-one-7400-mcn1
View File

@@ -1,14 +0,0 @@
#!/bin/sh
PROFILE_ID=$1
PROJECTDIR=$2
TARGET_SYSROOT_DIR=$3
YUM_CONF_PATH=$4
echo "----------------------------- Ansible Stage 1 ----------------------------"
echo "$PROFILE_ID"
echo "[tsg_7400_chroot_mcn0]" > $PROJECTDIR/ansible/install_config/tsg_7400_host
echo "$TARGET_SYSROOT_DIR ansible_connection=chroot" >> $PROJECTDIR/ansible/install_config/tsg_7400_host
ansible-playbook -i $PROJECTDIR/ansible/install_config/tsg_7400_host $PROJECTDIR/ansible/tsg_7400_deploy.yml -e "rpm_repo_config_path=$YUM_CONF_PATH"

14
tools/ansible-stage-one-7400-mcn2
View File

@@ -1,14 +0,0 @@
#!/bin/sh
PROFILE_ID=$1
PROJECTDIR=$2
TARGET_SYSROOT_DIR=$3
YUM_CONF_PATH=$4
echo "----------------------------- Ansible Stage 1 ----------------------------"
echo "$PROFILE_ID"
echo "[tsg_7400_chroot_mcn2]" > $PROJECTDIR/ansible/install_config/tsg_7400_host
echo "$TARGET_SYSROOT_DIR ansible_connection=chroot" >> $PROJECTDIR/ansible/install_config/tsg_7400_host
ansible-playbook -i $PROJECTDIR/ansible/install_config/tsg_7400_host $PROJECTDIR/ansible/tsg_7400_deploy.yml -e "rpm_repo_config_path=$YUM_CONF_PATH"

14
tools/ansible-stage-one-7400-mcn3
View File

@@ -1,14 +0,0 @@
#!/bin/sh
PROFILE_ID=$1
PROJECTDIR=$2
TARGET_SYSROOT_DIR=$3
YUM_CONF_PATH=$4
echo "----------------------------- Ansible Stage 1 ----------------------------"
echo "$PROFILE_ID"
echo "[tsg_7400_chroot_mcn3]" > $PROJECTDIR/ansible/install_config/tsg_7400_host
echo "$TARGET_SYSROOT_DIR ansible_connection=chroot" >> $PROJECTDIR/ansible/install_config/tsg_7400_host
ansible-playbook -i $PROJECTDIR/ansible/install_config/tsg_7400_host $PROJECTDIR/ansible/tsg_7400_deploy.yml -e "rpm_repo_config_path=$YUM_CONF_PATH"