diff options
| author | Paul Bourke <paul.bourke@oracle.com> | 2016-10-20 16:04:28 +0100 |
|---|---|---|
| committer | Paul Bourke <paul.bourke@oracle.com> | 2016-10-21 10:01:05 +0100 |
| commit | e2c43b206e0a2ad47505805f3dc8841adeb3bb51 (patch) | |
| tree | 92f4082e8b6bafc95f6e92f877a0af2388c394a9 | |
| parent | 4003763cbe79c23d75dda191c7a9a16edb71e37a (diff) | |
| download | kolla-e2c43b206e0a2ad47505805f3dc8841adeb3bb51.tar.gz kolla-e2c43b206e0a2ad47505805f3dc8841adeb3bb51.zip | |
Allow operators to customise pip in kolla-toolbox
Closes-Bug: #1635304
Change-Id: I6535e3240695458ed04c8750fe34e772a3b2ede3
| -rw-r--r-- | docker/kolla-toolbox/Dockerfile.j2 | 19 | ||||
| -rw-r--r-- | releasenotes/notes/customise-toolbox-pip-e574c422afae0d93.yaml | 4 |
2 files changed, 15 insertions, 8 deletions
diff --git a/docker/kolla-toolbox/Dockerfile.j2 b/docker/kolla-toolbox/Dockerfile.j2 index 78b0a6cbd..cbb495ac3 100644 --- a/docker/kolla-toolbox/Dockerfile.j2 +++ b/docker/kolla-toolbox/Dockerfile.j2 @@ -48,16 +48,19 @@ MAINTAINER {{ maintainer }} {% endif %} {{ macros.install_packages(kolla_toolbox_packages | customizable("packages")) }} +{% block kolla_toolbox_source_install_python_pip %} RUN curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py \ && python get-pip.py \ - && rm get-pip.py \ - && pip --no-cache-dir install pytz \ - && pip --no-cache-dir install \ - ansible==2.1.1.0 \ - MySQL-python \ - os-client-config==1.16.0 \ - pyudev \ - shade==1.5.0 + && rm get-pip.py +{% endblock %} + +RUN pip --no-cache-dir install \ + pytz \ + ansible==2.1.1.0 \ + MySQL-python \ + os-client-config==1.16.0 \ + pyudev \ + shade==1.5.0 RUN useradd -m --user-group ansible --groups kolla \ && mkdir -p /etc/ansible /usr/share/ansible \ diff --git a/releasenotes/notes/customise-toolbox-pip-e574c422afae0d93.yaml b/releasenotes/notes/customise-toolbox-pip-e574c422afae0d93.yaml new file mode 100644 index 000000000..f6b0dad48 --- /dev/null +++ b/releasenotes/notes/customise-toolbox-pip-e574c422afae0d93.yaml @@ -0,0 +1,4 @@ +--- +features: + - Allow operators to customise the installation of pip + within kolla-toolbox. |