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/kolla-toolbox | |
| 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/kolla-toolbox')
| -rw-r--r-- | docker/kolla-toolbox/Dockerfile.j2 | 2 |
1 files changed, 1 insertions, 1 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 \ |