diff options
Diffstat (limited to 'repo')
| -rw-r--r-- | repo/gen_ins_pkg_script.py | 11 | ||||
| -rw-r--r-- | repo/openstack/make_ppa/ubuntu/xenial/newton/download_pkg.tmpl | 2 | ||||
| -rw-r--r-- | repo/pip/Dockerfile | 4 | ||||
| -rw-r--r-- | repo/pip/code_url.conf | 6 | ||||
| -rwxr-xr-x | repo/repo_func.sh | 2 |
5 files changed, 19 insertions, 6 deletions
diff --git a/repo/gen_ins_pkg_script.py b/repo/gen_ins_pkg_script.py index 7f96d35d..38d08c23 100644 --- a/repo/gen_ins_pkg_script.py +++ b/repo/gen_ins_pkg_script.py @@ -1,3 +1,12 @@ +############################################################################## +# Copyright (c) 2016 HUAWEI TECHNOLOGIES CO.,LTD and others. +# +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Apache License, Version 2.0 +# which accompanies this distribution, and is available at +# http://www.apache.org/licenses/LICENSE-2.0 +############################################################################## + import yaml import os import sys @@ -77,7 +86,7 @@ def generate_download_script(root="", arch="", tmpl="", docker_tmpl="", default_ for filename in filenames: if os.path.isfile(os.path.join(parent, filename)): special_packages_names.append(filename) - searchList.update({'spcial_packages': special_packages_names}) + searchList.update({'special_packages': special_packages_names}) Dockerfile = os.path.basename(docker_tmpl).split('.')[0] tmpl = Template(file=docker_tmpl, searchList=searchList) diff --git a/repo/openstack/make_ppa/ubuntu/xenial/newton/download_pkg.tmpl b/repo/openstack/make_ppa/ubuntu/xenial/newton/download_pkg.tmpl index e10d4e22..f2a14f48 100644 --- a/repo/openstack/make_ppa/ubuntu/xenial/newton/download_pkg.tmpl +++ b/repo/openstack/make_ppa/ubuntu/xenial/newton/download_pkg.tmpl @@ -5,7 +5,7 @@ set -ex # add openstack $OPV repo apt-get update && apt-get install -y software-properties-common -# sudo add-apt-repository -y cloud-archive:$OPV +add-apt-repository -y cloud-archive:$OPV apt-get install -d nova-compute-kvm -y #make pernoca database diff --git a/repo/pip/Dockerfile b/repo/pip/Dockerfile index e8fed1ba..356c1459 100644 --- a/repo/pip/Dockerfile +++ b/repo/pip/Dockerfile @@ -23,6 +23,10 @@ RUN apt-get install -y git python-pip RUN apt-get install -y libssl-dev libffi-dev +RUN pip install --upgrade setuptools + +RUN pip install --upgrade pip + RUN mkdir -p /home/tmp RUN mkdir -p /pip-openstack diff --git a/repo/pip/code_url.conf b/repo/pip/code_url.conf index faf360e2..c3c90c4c 100644 --- a/repo/pip/code_url.conf +++ b/repo/pip/code_url.conf @@ -17,8 +17,8 @@ export GIT_URL="https://github.com/openstack/keystone.git \ https://github.com/openstack/python-heatclient.git \ https://github.com/openstack/aodh.git \ https://github.com/openstack/python-aodhclient.git \ - https://github.com/openstack/tacker.git \ - https://github.com/openstack/python-tackerclient.git " export PIP_GIT_URL="https://github.com/openstack/congress.git \ - https://github.com/openstack/python-congressclient.git" + https://github.com/openstack/python-congressclient.git \ + https://github.com/openstack/tacker.git \ + https://github.com/openstack/python-tackerclient.git" diff --git a/repo/repo_func.sh b/repo/repo_func.sh index 0999d77e..dfc02854 100755 --- a/repo/repo_func.sh +++ b/repo/repo_func.sh @@ -347,7 +347,7 @@ function make_compass_repo() python-yaml python-jinja2 python-paramiko elasticsearch logstash bind-license vim nmap-ncat \ yum cobbler cobbler-web createrepo mkisofs syslinux pykickstart bind rsync fence-agents \ dhcp xinetd tftp-server httpd libselinux-python python-setuptools python-devel mysql-devel \ - mysql-server mysql MySQL-python redis mod_wsgi net-tools rabbitmq-server nfs-utils" \ + mysql-server mysql MySQL-python redis mod_wsgi net-tools rabbitmq-server nfs-utils ntp ntpdate" \ --special-package "kibana jdk" } |