From 3c45625197e6adfe76cbd37c68673d2aba13f141 Mon Sep 17 00:00:00 2001 From: Vikram Hosakote Date: Mon, 6 Jun 2016 21:24:24 +0000 Subject: Fix Magnum trustee issues This patch set fixes all Magnum issues in kolla master. The [trust] section set to magnum.conf using created trustee domain and user for Magnum in ansible/roles/magnum/tasks/register.yml using ansible openstack modules. Bump shade to 1.5.0 in kolla-toolbox because of os_user_role ansible module dependency. Certificate storage is changed from 'local' (non-production) to magnum's internal storage (x509keypair) or barbican. Co-Authored-By: Martin Matyas Change-Id: Ifcb016c0bc4c8c3fc20e063fa05dc8838aae838c Closes-Bug: #1551992 --- docker/kolla-toolbox/Dockerfile.j2 | 2 +- docker/magnum/magnum-base/Dockerfile.j2 | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'docker') 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 %} -- cgit v1.2.3