openstack/kolla
Code Issues Proposed changes

Merge "always update APT lists when install packages"

Browse Source
This commit is contained in:
Jenkins 2017-05-10 11:09:58 +00:00 committed by Gerrit Code Review
commit e4fa287158
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
docker/opendaylight/Dockerfile.j2
View File

@ -24,8 +24,7 @@ COPY {{ opendaylight_repo }} /etc/yum.repos.d/
{% set odl_release_deb_url = 'http://download.opensuse.org/repositories/home:/akshitajha/Debian_8.0/' %} {% set odl_release_deb_url = 'http://download.opensuse.org/repositories/home:/akshitajha/Debian_8.0/' %}
{% endif %} {% endif %}
{% endif %} {% endif %}
RUN sh -c "echo 'deb {{ odl_release_deb_url }} /' > /etc/apt/sources.list.d/opendaylight.list" \ RUN sh -c "echo 'deb {{ odl_release_deb_url }} /' > /etc/apt/sources.list.d/opendaylight.list"
&& apt-get update
{% endif %} {% endif %}
{{ macros.install_packages(opendaylight_packages | customizable("packages")) }} {{ macros.install_packages(opendaylight_packages | customizable("packages")) }}

1
kolla/template/methods.py
View File

@ -44,6 +44,7 @@ def debian_package_install(packages):
# handle the apt-get install # handle the apt-get install
if reg_packages: if reg_packages:
cmds.append('apt-get update')
cmds.append('apt-get -y install --no-install-recommends {}'.format( cmds.append('apt-get -y install --no-install-recommends {}'.format(
' '.join(reg_packages) ' '.join(reg_packages)
)) ))

4
kolla/tests/test_methods.py
View File

@ -19,5 +19,5 @@ class MethodsTest(base.TestCase):
def test_debian_package_install(self): def test_debian_package_install(self):
packages = ['https://packages.debian.org/package1.deb', 'package2.deb'] packages = ['https://packages.debian.org/package1.deb', 'package2.deb']
result = methods.debian_package_install(packages) result = methods.debian_package_install(packages)
expectCmd = 'apt-get -y install --no-install-recommends package2.deb ' expectCmd = 'apt-get -y install --no-install-recommends package2.deb'
self.assertEqual(expectCmd, result.split("&&")[0]) self.assertEqual(expectCmd, result.split("&&")[1].strip())