diff options
| author |   grakiss <grakiss.wanglei@huawei.com> | 2016-04-25 21:24:40 -0400 |
|---|---|---|
| committer |   Justin chi <chigang@huawei.com> | 2016-04-28 09:17:09 +0000 |
| commit | 2e8b51173b5c85ae2a5f19d803db0b7390fc2819 (patch) | |
| tree | a06053492cb05d8e19bcec802627e1b15d6aff44 | |
| parent | 2bc92249007147f811fdf7c7d282b20bed1d69ec (diff) | |
FIX:make repo fail due to incorrect cheetah template
JIRA:COMPASS-378
Change-Id: I7cb9243b8fe5dc6d134b2323db0d33f0abf92ed3
Signed-off-by: grakiss <grakiss.wanglei@huawei.com>
| -rwxr-xr-x | build/make_repo.sh | 2 | ||||
| -rw-r--r-- | build/templates/Debian_juno.tmpl | 4 | ||||
| -rw-r--r-- | build/templates/Debian_kilo.tmpl | 4 | ||||
| -rw-r--r-- | build/templates/Debian_liberty.tmpl | 6 | ||||
| -rw-r--r-- | deploy/adapters/ansible/roles/common/vars/Debian.yml | 4 |
5 files changed, 17 insertions, 3 deletions
diff --git a/build/make_repo.sh b/build/make_repo.sh index 15e1f16e..ce24b971 100755 --- 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 4cf42975..95375693 100644 --- 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 d8efafbd..18c7fa00 100644 --- 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 93bd9f3e..4bb209eb 100644 --- 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 71218186..1d7972eb 100644 --- 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 |