diff options
| author | James McCarthy <james.m.mccarthy@oracle.com> | 2017-03-06 10:25:24 +0000 |
|---|---|---|
| committer | James McCarthy <james.m.mccarthy@oracle.com> | 2017-03-06 10:42:08 +0000 |
| commit | 0439e5fa3dfdd600381a9e18127c12f8dae7e662 (patch) | |
| tree | 49518fc669bbe8dde2d9a7bfe9a828b03729e835 | |
| parent | 4ff3e30f0bab602772814623113772ebe938f075 (diff) | |
| download | kolla-0439e5fa3dfdd600381a9e18127c12f8dae7e662.tar.gz kolla-0439e5fa3dfdd600381a9e18127c12f8dae7e662.zip | |
Update bifrost-base Dockerfile.j2 template.
To facilitate build custimisations in template-overrides.j2
for bifrost-base, added a block section wrapping the execution
of the ansible install.yaml playbook.
Change-Id: I4eb18d03b7d7b2a2f65ec3c844af9149f9426949
| -rw-r--r-- | docker/bifrost/bifrost-base/Dockerfile.j2 | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/docker/bifrost/bifrost-base/Dockerfile.j2 b/docker/bifrost/bifrost-base/Dockerfile.j2 index 4b2854e12..230ef97a0 100644 --- a/docker/bifrost/bifrost-base/Dockerfile.j2 +++ b/docker/bifrost/bifrost-base/Dockerfile.j2 @@ -30,6 +30,7 @@ WORKDIR /bifrost RUN sed -e "s/.*mariadb.*//Ig" -i /etc/apt/sources.list && apt-get purge -y mariadb* mysql* {% endif %} +{% block bifrost_ansible_install %} RUN bash -c './scripts/env-setup.sh && source ./env-vars && \ ansible-playbook -vvvv -i /bifrost/playbooks/inventory/target /bifrost/playbooks/install.yaml \ -e @/tmp/build_arg.yml && \ @@ -38,6 +39,7 @@ RUN bash -c './scripts/env-setup.sh && source ./env-vars && \ {% else %} yum clean all' {% endif %} +{% endblock %} {% endif %} COPY bifrost_sudoers /etc/sudoers.d/kolla_bifrost_sudoers |