Merge "Use correct inventory file for Bifrost"

This commit is contained in:
Jenkins 2017-02-17 13:09:22 +00:00 committed by Gerrit Code Review
commit 5c7427ccc9

View File

@ -27,7 +27,7 @@ RUN sed -e "s/.*mariadb.*//Ig" -i /etc/apt/sources.list && apt-get purge -y mari
{% endif %} {% endif %}
RUN bash -c './scripts/env-setup.sh && source ./env-vars && \ RUN bash -c './scripts/env-setup.sh && source ./env-vars && \
ansible-playbook -vvvv -i /bifrost/playbooks/inventory/localhost /bifrost/playbooks/install.yaml \ ansible-playbook -vvvv -i /bifrost/playbooks/inventory/target /bifrost/playbooks/install.yaml \
-e @/tmp/build_arg.yml && \ -e @/tmp/build_arg.yml && \
{% if base_distro in ['ubuntu', 'debian'] %} {% if base_distro in ['ubuntu', 'debian'] %}
apt-get clean' apt-get clean'