diff options
| author | Jenkins <jenkins@review.openstack.org> | 2017-01-21 10:05:24 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2017-01-21 10:05:24 +0000 |
| commit | 39e418873229db64d3a7f9dbe5bf7033e41eb683 (patch) | |
| tree | ce90e6c5821a12800218bb86b188e85eb4eab863 /docker | |
| parent | b08f2cc60ef7f4a0a8a9828d2ff1cf2fc44beaf9 (diff) | |
| parent | 040ff6ea037357a84a6450c944648b83eb833454 (diff) | |
| download | kolla-39e418873229db64d3a7f9dbe5bf7033e41eb683.tar.gz kolla-39e418873229db64d3a7f9dbe5bf7033e41eb683.zip | |
Merge "Fix ironic inspector"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/dnsmasq/Dockerfile.j2 | 12 | ||||
| -rw-r--r-- | docker/ironic/ironic-inspector/Dockerfile.j2 | 5 | ||||
| -rw-r--r-- | docker/ironic/ironic-inspector/extend_start.sh | 8 |
3 files changed, 24 insertions, 1 deletions
diff --git a/docker/dnsmasq/Dockerfile.j2 b/docker/dnsmasq/Dockerfile.j2 new file mode 100644 index 000000000..bcf62102d --- /dev/null +++ b/docker/dnsmasq/Dockerfile.j2 @@ -0,0 +1,12 @@ +FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }} +MAINTAINER {{ maintainer }} + +{% block dnsmasq_header %}{% endblock %} + +{% import "macros.j2" as macros with context %} + +{% set dnsmasq_packages = ['dnsmasq'] %} +{{ macros.install_packages(dnsmasq_packages| customizable("packages")) }} + +{% block dnsmasq_footer %}{% endblock %} +{% block footer %}{% endblock %} diff --git a/docker/ironic/ironic-inspector/Dockerfile.j2 b/docker/ironic/ironic-inspector/Dockerfile.j2 index 887078797..3eae4dab3 100644 --- a/docker/ironic/ironic-inspector/Dockerfile.j2 +++ b/docker/ironic/ironic-inspector/Dockerfile.j2 @@ -35,8 +35,11 @@ RUN ln -s ironic-inspector-source/* ironic-inspector \ {% endif %} COPY ironic_sudoers /etc/sudoers.d/kolla_ironic_inspector_sudoers +COPY extend_start.sh /usr/local/bin/kolla_ironic_extend_start + RUN chmod 750 /etc/sudoers.d \ - && chmod 440 /etc/sudoers.d/kolla_ironic_inspector_sudoers + && chmod 440 /etc/sudoers.d/kolla_ironic_inspector_sudoers \ + && chmod 755 /usr/local/bin/kolla_ironic_extend_start {% block ironic_inspector_footer %}{% endblock %} {% block footer %}{% endblock %} diff --git a/docker/ironic/ironic-inspector/extend_start.sh b/docker/ironic/ironic-inspector/extend_start.sh new file mode 100644 index 000000000..b87060adb --- /dev/null +++ b/docker/ironic/ironic-inspector/extend_start.sh @@ -0,0 +1,8 @@ +#!/bin/bash + +# Bootstrap and exit if KOLLA_BOOTSTRAP variable is set. This catches all cases +# of the KOLLA_BOOTSTRAP variable being set, including empty. +if [[ "${!KOLLA_BOOTSTRAP[@]}" ]]; then + ironic-inspector-dbsync --config-file /etc/ironic-inspector/inspector.conf upgrade + exit 0 +fi |