aboutsummaryrefslogtreecommitdiff
path: root/docker
diff options
context:
space:
mode:
authorGaetan Trellu <gaetan.trellu@incloudus.com>2019-05-29 08:59:05 -0400
committerGaetan Trellu <gaetan.trellu@incloudus.com>2019-05-29 10:10:32 -0400
commitc0f9ced6f2788a86c46b3214a6f3827c6a0dd122 (patch)
tree7d6fbfde49b1786bce5756a09bb7baa2bd3894ee /docker
parent3e9cf08ac59c6b38b1542ac12e19ff44af92eb12 (diff)
downloadkolla-c0f9ced6f2788a86c46b3214a6f3827c6a0dd122.tar.gz
kolla-c0f9ced6f2788a86c46b3214a6f3827c6a0dd122.zip
Use the default policy.json for Qinling
To avoid complexity and possible issue during the Qinling usage we should build the Qinling Docker images with the policy.json file. The reason why is because Qinling doesn't have default policies. Change-Id: I13f64fcbfb3150efcb94af267f463eaddb11621d Closes-Bug: #1830900 Implements: blueprint qinling-support
Diffstat (limited to 'docker')
-rw-r--r--docker/qinling/qinling-base/Dockerfile.j22
1 files changed, 1 insertions, 1 deletions
diff --git a/docker/qinling/qinling-base/Dockerfile.j2 b/docker/qinling/qinling-base/Dockerfile.j2
index 307fffa25..862296d85 100644
--- a/docker/qinling/qinling-base/Dockerfile.j2
+++ b/docker/qinling/qinling-base/Dockerfile.j2
@@ -23,7 +23,7 @@ ADD qinling-base-archive /qinling-base-source
RUN ln -s qinling-base-source/* qinling \
&& {{ macros.install_pip(qinling_base_pip_packages | customizable("pip_packages")) }} \
&& mkdir -p /etc/qinling \
- && cp -r /qinling/etc/* /etc/qinling/ \
+ && cp -r /qinling/etc/policy.json.sample /etc/qinling/policy.json \
&& chown -R qinling: /etc/qinling
{% endif %}