diff options
| author | Jenkins <jenkins@review.openstack.org> | 2017-05-10 11:09:58 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2017-05-10 11:09:58 +0000 |
| commit | e4fa28715856ed71351f4a6d13e3f2326df12281 (patch) | |
| tree | 33dbe0cb36179a94cbd762bd94b424a231ce0137 | |
| parent | 56c77a022483b36754e65aa4870519404da9f192 (diff) | |
| parent | bfc72492e7a10221237261e276f8b8d1fefa70e3 (diff) | |
| download | kolla-e4fa28715856ed71351f4a6d13e3f2326df12281.tar.gz kolla-e4fa28715856ed71351f4a6d13e3f2326df12281.zip | |
Merge "always update APT lists when install packages"
| -rw-r--r-- | docker/opendaylight/Dockerfile.j2 | 3 | ||||
| -rw-r--r-- | kolla/template/methods.py | 1 | ||||
| -rw-r--r-- | kolla/tests/test_methods.py | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/docker/opendaylight/Dockerfile.j2 b/docker/opendaylight/Dockerfile.j2 index 5a18f4dd7..c01087967 100644 --- a/docker/opendaylight/Dockerfile.j2 +++ b/docker/opendaylight/Dockerfile.j2 @@ -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/' %} {% endif %} {% endif %} -RUN sh -c "echo 'deb {{ odl_release_deb_url }} /' > /etc/apt/sources.list.d/opendaylight.list" \ -&& apt-get update +RUN sh -c "echo 'deb {{ odl_release_deb_url }} /' > /etc/apt/sources.list.d/opendaylight.list" {% endif %} {{ macros.install_packages(opendaylight_packages | customizable("packages")) }} diff --git a/kolla/template/methods.py b/kolla/template/methods.py index 7a6ac8d64..06a97afa8 100644 --- a/kolla/template/methods.py +++ b/kolla/template/methods.py @@ -44,6 +44,7 @@ def debian_package_install(packages): # handle the apt-get install if reg_packages: + cmds.append('apt-get update') cmds.append('apt-get -y install --no-install-recommends {}'.format( ' '.join(reg_packages) )) diff --git a/kolla/tests/test_methods.py b/kolla/tests/test_methods.py index dce013d67..1fb5dfa19 100644 --- a/kolla/tests/test_methods.py +++ b/kolla/tests/test_methods.py @@ -19,5 +19,5 @@ class MethodsTest(base.TestCase): def test_debian_package_install(self): packages = ['https://packages.debian.org/package1.deb', 'package2.deb'] result = methods.debian_package_install(packages) - expectCmd = 'apt-get -y install --no-install-recommends package2.deb ' - self.assertEqual(expectCmd, result.split("&&")[0]) + expectCmd = 'apt-get -y install --no-install-recommends package2.deb' + self.assertEqual(expectCmd, result.split("&&")[1].strip()) |