diff options
| author | Zuul <zuul@review.opendev.org> | 2019-06-03 19:25:51 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2019-06-03 19:25:51 +0000 |
| commit | 4e083196d14877de458ae16129331c37fe1f6f21 (patch) | |
| tree | 70b9f988f68e3e71baf4db0d040c8e42a58949f3 /docker | |
| parent | be775aa6cf725f6f2a3e44055ca9bc347a94b0db (diff) | |
| parent | c0f9ced6f2788a86c46b3214a6f3827c6a0dd122 (diff) | |
| download | kolla-4e083196d14877de458ae16129331c37fe1f6f21.tar.gz kolla-4e083196d14877de458ae16129331c37fe1f6f21.zip | |
Merge "Use the default policy.json for Qinling"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/qinling/qinling-base/Dockerfile.j2 | 2 |
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 %} |