diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-03-01 13:00:24 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-03-01 13:00:24 +0000 |
| commit | 3aedf52489ed5bc68e43899ca21dae13fc2b5100 (patch) | |
| tree | 3fbc9f02e246bd33a9f3eb17ca1546b96648c850 /docker | |
| parent | 31a7e37f0916724f2d3c0382966ac02508ea7f69 (diff) | |
| parent | 235e95885b9d59d61dc716d303520a609d4e596b (diff) | |
| download | kolla-3aedf52489ed5bc68e43899ca21dae13fc2b5100.tar.gz kolla-3aedf52489ed5bc68e43899ca21dae13fc2b5100.zip | |
Merge "Move ironic-discoverd to ironic-inspector"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/ironic/ironic-base/Dockerfile.j2 | 3 | ||||
| -rw-r--r-- | docker/ironic/ironic-inspector/Dockerfile.j2 (renamed from docker/ironic/ironic-discoverd/Dockerfile.j2) | 8 |
2 files changed, 5 insertions, 6 deletions
diff --git a/docker/ironic/ironic-base/Dockerfile.j2 b/docker/ironic/ironic-base/Dockerfile.j2 index 4dc6e7fc3..8447f92ff 100644 --- a/docker/ironic/ironic-base/Dockerfile.j2 +++ b/docker/ironic/ironic-base/Dockerfile.j2 @@ -28,4 +28,5 @@ RUN ln -s ironic-base-source/* ironic \ {% endif %} -RUN usermod -a -G kolla ironic +RUN usermod -a -G kolla ironic \ + && chown -R ironic: /etc/ironic diff --git a/docker/ironic/ironic-discoverd/Dockerfile.j2 b/docker/ironic/ironic-inspector/Dockerfile.j2 index 536d2b878..217a73e06 100644 --- a/docker/ironic/ironic-discoverd/Dockerfile.j2 +++ b/docker/ironic/ironic-inspector/Dockerfile.j2 @@ -4,11 +4,9 @@ MAINTAINER {{ maintainer }} {% if install_type == 'binary' %} {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} -RUN pip install ironic-discoverd -# discoverd no longer in delorean 9/28/2015, switch to inspector on TODO -#RUN yum -y install \ -# openstack-ironic-discoverd \ -# && yum clean all +RUN yum -y install \ + openstack-ironic-inspector \ + && yum clean all {% endif %} {% endif %} |