FIX:make repo fail due to incorrect cheetah template

JIRA:COMPASS-378

Change-Id: I7cb9243b8fe5dc6d134b2323db0d33f0abf92ed3
Signed-off-by: grakiss <grakiss.wanglei@huawei.com>

diff --git a/build/make_repo.sh b/build/make_repo.sh
index 15e1f16..ce24b97 100755 (executable)
--- a/build/make_repo.sh
+++ b/build/make_repo.sh
@@ -193,7 +193,7 @@ function make_all_repo()
                                  dracut-config-rescue-033-241.el7_1.3 dracut-network-033-241.el7_1.3"
 
     for opv in kilo liberty; do
-    make_repo --os-ver rhel7 --package-tag kilo \
+    make_repo --os-ver rhel7 --package-tag $opv \
               --ansible-dir $WORK_PATH/deploy/adapters/ansible \
               --default-package "rsyslog-7.6.7-1.el7 strace net-tools wget vim openssh-server \
                                  dracut-config-rescue-033-241.el7_1.5 dracut-network-033-241.el7_1.5"

diff --git a/build/templates/Debian_juno.tmpl b/build/templates/Debian_juno.tmpl
index 4cf4297..9537569 100644 (file)
--- a/build/templates/Debian_juno.tmpl
+++ b/build/templates/Debian_juno.tmpl
@@ -20,6 +20,10 @@ sudo apt-get update
 
 sudo apt-get install reprepro -y
 
+cd /var/cache/apt/
+sudo apt-get download libexpat1
+cd -
+
 #download packages
 #set packages = $getVar('default_packages', [])
 #for pkg in $packages

diff --git a/build/templates/Debian_kilo.tmpl b/build/templates/Debian_kilo.tmpl
index d8efafb..18c7fa0 100644 (file)
--- a/build/templates/Debian_kilo.tmpl
+++ b/build/templates/Debian_kilo.tmpl
@@ -18,6 +18,10 @@ sudo apt-get update
 
 sudo apt-get install reprepro -y
 
+cd /var/cache/apt/
+sudo apt-get download libexpat1
+cd -
+
 #download packages
 #set packages = $getVar('default_packages', [])
 #for pkg in $packages

diff --git a/build/templates/Debian_liberty.tmpl b/build/templates/Debian_liberty.tmpl
index 93bd9f3..4bb209e 100644 (file)
--- a/build/templates/Debian_liberty.tmpl
+++ b/build/templates/Debian_liberty.tmpl
@@ -21,6 +21,12 @@ sudo apt-get update
 
 sudo apt-get install reprepro -y
 
+sudo apt-get -d install pciutils -y
+
+cd /var/cache/apt/
+sudo apt-get download libexpat1
+cd -
+
 #download packages
 #set packages = $getVar('default_packages', [])
 #for pkg in $packages

diff --git a/deploy/adapters/ansible/roles/common/vars/Debian.yml b/deploy/adapters/ansible/roles/common/vars/Debian.yml
index 7121818..1d7972e 100644 (file)
--- a/deploy/adapters/ansible/roles/common/vars/Debian.yml
+++ b/deploy/adapters/ansible/roles/common/vars/Debian.yml
@@ -9,13 +9,13 @@
 ---
 packages:
   - ubuntu-cloud-keyring
-  #- python-dev
+  - python-dev
   - openvswitch-datapath-dkms
   - openvswitch-switch
   - python-memcache
   - python-iniparse
   - python-lxml
-  - python-d* #TODO, need remove
+  #- python-d* #TODO, need remove
 
 pip_packages:
   - crudini