aboutsummaryrefslogtreecommitdiffstats
path: root/repo
diff options
context:
space:
mode:
authorYifei Xue <xueyifei@huawei.com>2017-03-01 16:39:43 +0800
committerJustin chi <chigang@huawei.com>2017-03-08 04:42:53 +0000
commit4ba62d9db32b1624a8bb0cd1428fc8dd0ec37da7 (patch)
tree4afaaf5f5e6969b97929520fd0f9aefdeec44bf4 /repo
parent3a90b69c278bf4f822d182ce7f1c995f32760173 (diff)
Upgrade tacker from mitaka to newton
JIRA: COMPASS-528 Add tacker package making scripts into repo/pip/ directory. Compass will install tacker using pip in this release. Upgrade tacker role including tasks, templates and vars. Modify the installation method from using source code to using whl package. Change-Id: Iead323c7b46d8d1df084ed868d0e01bc1b0f7e55 Signed-off-by: Yifei Xue <xueyifei@huawei.com>
Diffstat (limited to 'repo')
-rw-r--r--repo/gen_ins_pkg_script.py2
-rw-r--r--repo/openstack/make_ppa/ubuntu/xenial/newton/download_pkg.tmpl2
-rw-r--r--repo/pip/Dockerfile4
-rw-r--r--repo/pip/code_url.conf6
4 files changed, 9 insertions, 5 deletions
diff --git a/repo/gen_ins_pkg_script.py b/repo/gen_ins_pkg_script.py
index 7313965..38d08c2 100644
--- a/repo/gen_ins_pkg_script.py
+++ b/repo/gen_ins_pkg_script.py
@@ -86,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 e10d4e2..f2a14f4 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 e8fed1b..356c145 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 faf360e..c3c90c4 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"