diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-09-28 15:34:56 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-09-28 15:34:56 +0000 |
| commit | 869aa073b549c837b32a8538a40f98d419ce5a84 (patch) | |
| tree | 113bd17dd0a222196f821d37a30e384a2e0bb375 /docker | |
| parent | 8bde923bba404fa088767a11b55371cb81232a9b (diff) | |
| parent | 3c45625197e6adfe76cbd37c68673d2aba13f141 (diff) | |
| download | kolla-869aa073b549c837b32a8538a40f98d419ce5a84.tar.gz kolla-869aa073b549c837b32a8538a40f98d419ce5a84.zip | |
Merge "Fix Magnum trustee issues"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/kolla-toolbox/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | docker/magnum/magnum-base/Dockerfile.j2 | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/docker/kolla-toolbox/Dockerfile.j2 b/docker/kolla-toolbox/Dockerfile.j2 index b05d1a512..78b0a6cbd 100644 --- a/docker/kolla-toolbox/Dockerfile.j2 +++ b/docker/kolla-toolbox/Dockerfile.j2 @@ -57,7 +57,7 @@ RUN curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py \ MySQL-python \ os-client-config==1.16.0 \ pyudev \ - shade==1.4.0 + shade==1.5.0 RUN useradd -m --user-group ansible --groups kolla \ && mkdir -p /etc/ansible /usr/share/ansible \ diff --git a/docker/magnum/magnum-base/Dockerfile.j2 b/docker/magnum/magnum-base/Dockerfile.j2 index f9b7abc33..32b597289 100644 --- a/docker/magnum/magnum-base/Dockerfile.j2 +++ b/docker/magnum/magnum-base/Dockerfile.j2 @@ -21,9 +21,9 @@ ADD magnum-base-archive /magnum-base-source RUN ln -s magnum-base-source/* magnum \ && useradd --user-group magnum \ && /var/lib/kolla/venv/bin/pip --no-cache-dir install --upgrade -c requirements/upper-constraints.txt /magnum \ - && mkdir -p /etc/magnum /home/magnum \ + && mkdir -p /etc/magnum /home/magnum /var/lib/magnum \ && cp -r /magnum/etc/magnum/* /etc/magnum \ - && chown -R magnum: /etc/magnum /home/magnum + && chown -R magnum: /etc/magnum /home/magnum /var/lib/magnum {% endif %} |