diff options
| author | Allen Gao <wanlong.gao@easystack.cn> | 2016-02-16 20:31:39 +0800 |
|---|---|---|
| committer | Allen Gao <wanlong.gao@easystack.cn> | 2016-02-29 11:47:52 +0800 |
| commit | 235e95885b9d59d61dc716d303520a609d4e596b (patch) | |
| tree | 45c647726254ade3c456c489cd6b7fa68ed0e8c2 /docker/ironic | |
| parent | 846a19035adfa2c772d6a1fe52511f937cc8a0e6 (diff) | |
| download | kolla-235e95885b9d59d61dc716d303520a609d4e596b.tar.gz kolla-235e95885b9d59d61dc716d303520a609d4e596b.zip | |
Move ironic-discoverd to ironic-inspector
Closes-Bug: #1551052
Change-Id: Ic226287bbf1f1e8d5cc2e1d80ce2975448b1f95c
Diffstat (limited to 'docker/ironic')
| -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 %} |