From 80c1dc5df30bf5f7d6e15895c32a35dd593655f8 Mon Sep 17 00:00:00 2001
From: fumingwei <fumingwei@geedgenetworks.com>
Date: Fri, 14 May 2021 13:55:43 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9ansible=E4=BB=8Eyum=E6=BA=90?=
 =?UTF-8?q?=E6=8B=89=E5=8F=96=E5=AE=89=E8=A3=85rpm=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 conf/resolv.conf                                       |  2 ++
 make/Makefile.9000NPBP01R01                            |  5 +++--
 tools/ansible-stage-one                                |  3 ++-
 .../install_config/group_vars/tsg_9140_docker.yml      |  3 ---
 tsg-9140-scripts/roles/exporter/tasks/main.yml         |  5 -----
 tsg-9140-scripts/roles/framework/tasks/main.yml        | 10 ++++++++++
 6 files changed, 17 insertions(+), 11 deletions(-)
 create mode 100644 conf/resolv.conf

diff --git a/conf/resolv.conf b/conf/resolv.conf
new file mode 100644
index 00000000..f5d24a1a
--- /dev/null
+++ b/conf/resolv.conf
@@ -0,0 +1,2 @@
+nameserver 114.114.114.114
+nameserver 8.8.8.8
diff --git a/make/Makefile.9000NPBP01R01 b/make/Makefile.9000NPBP01R01
index 8c7791c3..08902be0 100644
--- a/make/Makefile.9000NPBP01R01
+++ b/make/Makefile.9000NPBP01R01
@@ -45,8 +45,9 @@ sysroot-verfile: sysroot-base
 	sed -i -e "s/^PRETTY_NAME=.*/PRETTY_NAME=\"TSG-OS v$(OS_RELEASE_VER) ($(PROFILE_ID_IN_SHORT))\"/" $(TARGET_SYSROOT_DIR)/usr/lib/os-release
 
 sysroot-ansible: sysroot-verfile sysroot-base
-	cp $(CONFDIR) $(TARGET_SYSROOT_DIR)/tmp/
-	$(TOOLSDIR)/ansible-stage-one $(PROFILE_ID) $(PROJECTDIR) $(TARGET_SYSROOT_DIR)
+	cp $(CONFDIR)/yum.conf $(TARGET_SYSROOT_DIR)/tmp/ -r
+	cp $(CONFDIR)/resolv.conf $(TARGET_SYSROOT_DIR)/etc/ -r
+	$(TOOLSDIR)/ansible-stage-one $(PROFILE_ID) $(PROJECTDIR) $(TARGET_SYSROOT_DIR) /tmp/yum.conf
 
 sysroot-cleanup:
 	rm -rf $(TARGET_SYSROOT_DIR)/tmp/*
diff --git a/tools/ansible-stage-one b/tools/ansible-stage-one
index 8ea2ca95..77971a2c 100755
--- a/tools/ansible-stage-one
+++ b/tools/ansible-stage-one
@@ -3,6 +3,7 @@
 PROFILE_ID=$1
 PROJECTDIR=$2
 TARGET_SYSROOT_DIR=$3
+YUM_CONF_PATH=$4
 
 echo "-----------------------------  Ansible Stage 1  ----------------------------"
 echo "$PROFILE_ID"
@@ -10,4 +11,4 @@ echo "$PROFILE_ID"
 echo "[tsg_9140_chroot]" > $PROJECTDIR/tsg-9140-scripts/install_config/tsg_9140_host
 echo "$TARGET_SYSROOT_DIR  ansible_connection=chroot" >> $PROJECTDIR/tsg-9140-scripts/install_config/tsg_9140_host
 
-ansible-playbook -i $PROJECTDIR/tsg-9140-scripts/install_config/tsg_9140_host $PROJECTDIR/tsg-9140-scripts/tsg_9140_deploy.yml
+ansible-playbook -i $PROJECTDIR/tsg-9140-scripts/install_config/tsg_9140_host $PROJECTDIR/tsg-9140-scripts/tsg_9140_deploy.yml -e "rpm_repo_config_path=$YUM_CONF_PATH"
diff --git a/tsg-9140-scripts/install_config/group_vars/tsg_9140_docker.yml b/tsg-9140-scripts/install_config/group_vars/tsg_9140_docker.yml
index a5df984a..1cf3b923 100644
--- a/tsg-9140-scripts/install_config/group_vars/tsg_9140_docker.yml
+++ b/tsg-9140-scripts/install_config/group_vars/tsg_9140_docker.yml
@@ -49,6 +49,3 @@ kni:
     tfe0_enabled: 1
     tfe1_enabled: 0
     tfe2_enabled: 0
-
-######rpm repo config path##############
-rpm_repo_config_path: "/tmp/yum.conf"
\ No newline at end of file
diff --git a/tsg-9140-scripts/roles/exporter/tasks/main.yml b/tsg-9140-scripts/roles/exporter/tasks/main.yml
index bdf9c25e..b7f69516 100644
--- a/tsg-9140-scripts/roles/exporter/tasks/main.yml
+++ b/tsg-9140-scripts/roles/exporter/tasks/main.yml
@@ -1,8 +1,3 @@
-- name: "copy freeipmi tools"
-  copy:
-    src: '{{ role_path }}/files/freeipmi-1.5.7-3.el7.x86_64.rpm'
-    dest: /tmp/ansible_deploy/
-
 - name: "Install freeipmi rpm package"
   yum:
     name: freeipmi
diff --git a/tsg-9140-scripts/roles/framework/tasks/main.yml b/tsg-9140-scripts/roles/framework/tasks/main.yml
index 62331fe8..ea3ec474 100644
--- a/tsg-9140-scripts/roles/framework/tasks/main.yml
+++ b/tsg-9140-scripts/roles/framework/tasks/main.yml
@@ -3,6 +3,16 @@
     src: "{{ role_path }}/files/"
     dest: "/tmp/ansible_deploy/"
 
+- name: "install framework packages by rpm packages"
+  yum:
+    name: "{{ packages }}"
+    state: present
+    skip_broken: yes
+  vars:
+    packages:
+      - /tmp/ansible_deploy/librdkafka-0.11.4-1.el7.x86_64.rpm
+      - /tmp/ansible_deploy/lz4-1.7.5-3.el7.x86_64.rpm
+
 - name: "install framework packages"
   yum:
     name: "{{ item.value }}"