diff options
| author | Vikram Hosakote <vhosakot@cisco.com> | 2016-06-06 21:24:24 +0000 |
|---|---|---|
| committer | Martin Matyáš <martinx.maty@intel.com> | 2016-09-27 21:23:46 -0700 |
| commit | 3c45625197e6adfe76cbd37c68673d2aba13f141 (patch) | |
| tree | 52f3842a6279c65288dd6da9b4e2f7c19be2f4e4 /docker/magnum | |
| parent | b32d7ce8028c5f4bb8749ce18fcfeb3f956601b9 (diff) | |
| download | kolla-3c45625197e6adfe76cbd37c68673d2aba13f141.tar.gz kolla-3c45625197e6adfe76cbd37c68673d2aba13f141.zip | |
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 <martinx.maty@intel.com>
Change-Id: Ifcb016c0bc4c8c3fc20e063fa05dc8838aae838c
Closes-Bug: #1551992
Diffstat (limited to 'docker/magnum')
| -rw-r--r-- | docker/magnum/magnum-base/Dockerfile.j2 | 4 |
1 files changed, 2 insertions, 2 deletions
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 %} |