From 235e95885b9d59d61dc716d303520a609d4e596b Mon Sep 17 00:00:00 2001
From: Allen Gao <wanlong.gao@easystack.cn>
Date: Tue, 16 Feb 2016 20:31:39 +0800
Subject: Move ironic-discoverd to ironic-inspector

Closes-Bug: #1551052
Change-Id: Ic226287bbf1f1e8d5cc2e1d80ce2975448b1f95c
---
 docker/ironic/ironic-base/Dockerfile.j2      |  3 ++-
 docker/ironic/ironic-discoverd/Dockerfile.j2 | 18 ------------------
 docker/ironic/ironic-inspector/Dockerfile.j2 | 16 ++++++++++++++++
 3 files changed, 18 insertions(+), 19 deletions(-)
 delete mode 100644 docker/ironic/ironic-discoverd/Dockerfile.j2
 create mode 100644 docker/ironic/ironic-inspector/Dockerfile.j2

(limited to 'docker')

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-discoverd/Dockerfile.j2
deleted file mode 100644
index 536d2b878..000000000
--- a/docker/ironic/ironic-discoverd/Dockerfile.j2
+++ /dev/null
@@ -1,18 +0,0 @@
-FROM {{ namespace }}/{{ image_prefix }}ironic-base:{{ tag }}
-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
-
-    {% endif %}
-{% endif %}
-
-{{ include_footer }}
-
-USER ironic
diff --git a/docker/ironic/ironic-inspector/Dockerfile.j2 b/docker/ironic/ironic-inspector/Dockerfile.j2
new file mode 100644
index 000000000..217a73e06
--- /dev/null
+++ b/docker/ironic/ironic-inspector/Dockerfile.j2
@@ -0,0 +1,16 @@
+FROM {{ namespace }}/{{ image_prefix }}ironic-base:{{ tag }}
+MAINTAINER {{ maintainer }}
+
+{% if install_type == 'binary' %}
+    {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}
+
+RUN yum -y install \
+    openstack-ironic-inspector \
+    && yum clean all
+
+    {% endif %}
+{% endif %}
+
+{{ include_footer }}
+
+USER ironic
-- 
cgit v1.2.3