Merge "fix ironic-inspector setup"

ansible/roles/ironic/templates/ironic-inspector.json.j2

@@ -1,9 +1,9 @@
 {
-    "command": "ironic-inspector --config-file /etc/ironic/ironic.conf",
+    "command": "ironic-inspector --config-file /etc/ironic-inspector/ironic.conf",
     "config_files": [
         {
             "source": "{{ container_config_directory }}/ironic.conf",
-            "dest": "/etc/ironic/ironic.conf",
+            "dest": "/etc/ironic-inspector/ironic.conf",
             "owner": "ironic",
             "perm": "0600"
         }

docker/ironic/ironic-inspector/Dockerfile.j2

@@ -15,10 +15,20 @@ MAINTAINER {{ maintainer }}
 {{ macros.install_packages(ironic_inspector_packages | customizable("packages")) }}
 
 {% elif install_type == 'source' %}
-RUN /var/lib/kolla/venv/bin/pip --no-cache-dir install --upgrade -c requirements/upper-constraints.txt \
-    ironic-inspector
+ADD ironic-inspector-archive /ironic-inspector-source
+RUN ln -s ironic-inspector-source/* ironic-inspector \
+    && mv /etc/ironic /etc/ironic-inspector \
+    && /var/lib/kolla/venv/bin/pip --no-cache-dir install --upgrade -c requirements/upper-constraints.txt /ironic-inspector \
+    && cp /ironic-inspector/rootwrap.conf /etc/ironic-inspector/ \
+    && cp -r /ironic-inspector/rootwrap.d/ /etc/ironic-inspector/ \
+    && sed -i 's|^exec_dirs.*|exec_dirs=/var/lib/kolla/venv/bin,/sbin,/usr/sbin,/bin,/usr/bin,/usr/local/bin,/usr/local/sbin|g' /etc/ironic-inspector/rootwrap.conf
+
 {% endif %}
 
+COPY ironic_sudoers /etc/sudoers.d/kolla_ironic_inspector_sudoers
+RUN chmod 750 /etc/sudoers.d \
+    && chmod 440 /etc/sudoers.d/kolla_ironic_inspector_sudoers
+
 {% block ironic_inspector_footer %}{% endblock %}
 {% block footer %}{% endblock %}
 {{ include_footer }}

docker/ironic/ironic-inspector/ironic_sudoers

@@ -0,0 +1 @@
+ironic ALL=(root) NOPASSWD: /var/lib/kolla/venv/bin/ironic-inspector-rootwrap /etc/ironic-inspector/rootwrap.conf *

kolla/common/config.py

@@ -213,6 +213,10 @@ SOURCES = {
         'type': 'url',
         'location': ('http://tarballs.openstack.org/ironic/'
                      'ironic-master.tar.gz')},
+    'ironic-inspector': {
+        'type': 'url',
+        'location': ('http://tarballs.openstack.org/ironic-inspector/'
+                     'ironic-inspector-master.tar.gz')},
     'keystone-base': {
         'type': 'url',
         'location': ('http://tarballs.openstack.org/keystone/'