aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--docker/magnum/magnum-base/Dockerfile.j21
-rw-r--r--releasenotes/notes/magnum-keystone-auth-default-policy-e16f7bb558aa4b14.yaml5
2 files changed, 6 insertions, 0 deletions
diff --git a/docker/magnum/magnum-base/Dockerfile.j2 b/docker/magnum/magnum-base/Dockerfile.j2
index 83f5a5759..7da2016d7 100644
--- a/docker/magnum/magnum-base/Dockerfile.j2
+++ b/docker/magnum/magnum-base/Dockerfile.j2
@@ -29,6 +29,7 @@ RUN ln -s magnum-base-source/* magnum \
&& {{ macros.install_pip(magnum_base_pip_packages | customizable("pip_packages")) }} \
&& mkdir -p /etc/magnum \
&& cp -r /magnum/etc/magnum/* /etc/magnum \
+ && mv /etc/magnum/keystone_auth_default_policy.sample /etc/magnum/keystone_auth_default_policy.json \
&& chown -R magnum: /etc/magnum
{% endif %}
diff --git a/releasenotes/notes/magnum-keystone-auth-default-policy-e16f7bb558aa4b14.yaml b/releasenotes/notes/magnum-keystone-auth-default-policy-e16f7bb558aa4b14.yaml
new file mode 100644
index 000000000..820b69d3c
--- /dev/null
+++ b/releasenotes/notes/magnum-keystone-auth-default-policy-e16f7bb558aa4b14.yaml
@@ -0,0 +1,5 @@
+---
+fixes:
+ - |
+ Fixes an issue with missing Magnum Keystone auth default policy.
+ `LP#1957159 <https://launchpad.net/bugs/1957159>`__