Merge "Move ironic-discoverd to ironic-inspector"

ansible/inventory/all-in-one

@@ -180,7 +180,7 @@ ironic
 [ironic-conductor:children]
 ironic
 
-[ironic-discoverd:children]
+[ironic-inspector:children]
 ironic
 
 [ironic-pxe:children]

ansible/inventory/multinode

@@ -205,7 +205,7 @@ ironic
 [ironic-conductor:children]
 ironic
 
-[ironic-discoverd:children]
+[ironic-inspector:children]
 ironic
 
 [ironic-pxe:children]

ansible/roles/ironic/defaults/main.yml

@@ -20,9 +20,9 @@ ironic_conductor_image: "{{ docker_registry ~ '/' if docker_registry else '' }}{
 ironic_conductor_tag: "{{ openstack_release }}"
 ironic_conductor_image_full: "{{ ironic_conductor_image }}:{{ ironic_conductor_tag }}"
 
-ironic_discoverd_image: "{{ docker_registry ~ '/' if docker_registry else '' }}{{ docker_namespace }}/{{ kolla_base_distro }}-{{ kolla_install_type }}-ironic-discoverd"
+ironic_inspector_image: "{{ docker_registry ~ '/' if docker_registry else '' }}{{ docker_namespace }}/{{ kolla_base_distro }}-{{ kolla_install_type }}-ironic-inspector"
-ironic_discoverd_tag: "{{ openstack_release }}"
+ironic_inspector_tag: "{{ openstack_release }}"
-ironic_discoverd_image_full: "{{ ironic_discoverd_image }}:{{ ironic_discoverd_tag }}"
+ironic_inspector_image_full: "{{ ironic_inspector_image }}:{{ ironic_inspector_tag }}"
 
 ironic_pxe_image: "{{ docker_registry ~ '/' if docker_registry else '' }}{{ docker_namespace }}/{{ kolla_base_distro }}-{{ kolla_install_type }}-ironic-pxe"
 ironic_pxe_tag: "{{ openstack_release }}"

ansible/roles/ironic/tasks/config.yml

@@ -7,7 +7,7 @@
   with_items:
     - "ironic-api"
     - "ironic-conductor"
-    - "ironic-discoverd"
+    - "ironic-inspector"
     - "ironic-pxe"
 
 - name: Copying over config.json files for services
@@ -17,7 +17,7 @@
   with_items:
     - "ironic-api"
     - "ironic-conductor"
-    - "ironic-discoverd"
+    - "ironic-inspector"
     - "ironic-pxe"
 
 - name: Copying over ironic.conf
@@ -35,4 +35,4 @@
   with_items:
     - "ironic-api"
     - "ironic-conductor"
-    - "ironic-discoverd"
+    - "ironic-inspector"

ansible/roles/ironic/tasks/deploy.yml

@@ -5,7 +5,7 @@
 - include: config.yml
   when: inventory_hostname in groups['ironic-api'] or
         inventory_hostname in groups['ironic-conductor'] or
-        inventory_hostname in groups['ironic-discoverd'] or
+        inventory_hostname in groups['ironic-inspector'] or
         inventory_hostname in groups['ironic-pxe']
 
 - include: bootstrap.yml
@@ -14,5 +14,5 @@
 - include: start.yml
   when: inventory_hostname in groups['ironic-api'] or
         inventory_hostname in groups['ironic-conductor'] or
-        inventory_hostname in groups['ironic-discoverd'] or
+        inventory_hostname in groups['ironic-inspector'] or
         inventory_hostname in groups['ironic-pxe']

ansible/roles/ironic/tasks/pull.yml

@@ -13,12 +13,12 @@
     image: "{{ ironic_conductor_image_full }}"
   when: inventory_hostname in groups['ironic-conductor']
 
-- name: Pulling ironic-discoverd image
+- name: Pulling ironic-inspector image
   kolla_docker:
     action: "pull_image"
     common_options: "{{ docker_common_options }}"
-    image: "{{ ironic_discoverd_image_full }}"
+    image: "{{ ironic_inspector_image_full }}"
-  when: inventory_hostname in groups['ironic-discoverd']
+  when: inventory_hostname in groups['ironic-inspector']
 
 - name: Pulling ironic-pxe image
   kolla_docker:

ansible/roles/ironic/tasks/start.yml

@@ -30,12 +30,12 @@
       - "ironic_pxe:/tftpboot/"
   when: inventory_hostname in groups['ironic-conductor']
 
-- name: Starting ironic-discoverd container
+- name: Starting ironic-inspector container
   kolla_docker:
     action: "start_container"
     common_options: "{{ docker_common_options }}"
-    image: "{{ ironic_discoverd_image_full }}"
+    image: "{{ ironic_inspector_image_full }}"
-    name: "ironic_discoverd"
+    name: "ironic_inspector"
     privileged: True
-    volumes: "{{ node_config_directory }}/ironic-discoverd/:{{ container_config_directory }}/:ro"
+    volumes: "{{ node_config_directory }}/ironic-inspector/:{{ container_config_directory }}/:ro"
-  when: inventory_hostname in groups['ironic-discoverd']
+  when: inventory_hostname in groups['ironic-inspector']

ansible/roles/ironic/templates/discoverd.conf.j2

@@ -1,11 +0,0 @@
-[discoverd]
-database = inspector.sqlite3
-os_auth_url = {{ internal_protocol }}://{{ kolla_internal_fqdn }}:{{ keystone_public_port }}/v2.0
-os_username = {{ openstack_auth.username }}
-os_password = {{ openstack_auth.password }}
-os_tenant_name = {{ openstack_auth.project_name }}
-identity_uri = {{ openstack_auth.auth_url }}
-
-# Note: this will be in the firewall section once upgraded to inspector
-# unsure of the correct interface here
-dnsmasq_interface = {{ api_interface }}

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

@@ -1,5 +1,5 @@
 {
-    "command": "ironic-discoverd --config-file /etc/ironic/ironic.conf",
+    "command": "ironic-inspector --config-file /etc/ironic/ironic.conf",
     "config_files": [
         {
             "source": "{{ container_config_directory }}/ironic.conf",

ansible/roles/ironic/templates/ironic.conf.j2

@@ -15,6 +15,18 @@ api_url = {{ internal_protocol }}://{{ kolla_internal_fqdn }}:{{ ironic_api_port
 clean_nodes = false
 {% endif %}
 
+{% if service_name == 'ironic-inspector' %}
+[ironic]
+os_auth_url = {{ admin_protocol }}://{{ kolla_internal_fqdn }}:{{ keystone_public_port }}/v2.0
+os_username = {{ openstack_auth.username }}
+os_password = {{ openstack_auth.password }}
+os_tenant_name = {{ openstack_auth.project_name }}
+identity_uri = {{ openstack_auth.auth_url }}
+
+[firewall]
+dnsmasq_interface = {{ api_interface }}
+{% endif %}
+
 [database]
 connection = mysql+pymysql://{{ ironic_database_user }}:{{ ironic_database_password }}@{{ ironic_database_address }}/{{ ironic_database_name }}
 

ansible/roles/nova/templates/nova.conf.j2

@@ -78,7 +78,6 @@ html5proxy_port = {{ nova_spicehtml5proxy_port }}
 
 {% if service_name == "nova-compute-ironic" %}
 [ironic]
-#(TODO) remember to update this once discoverd is replaced by inspector
 admin_username = {{ ironic_keystone_user }}
 admin_password = {{ ironic_keystone_password }}
 admin_url = {{ openstack_auth_v2.auth_url }}

ansible/site.yml

@@ -151,7 +151,7 @@
 - hosts:
     - ironic-api
     - ironic-conductor
-    - ironic-discoverd
+    - ironic-inspector
     - ironic-pxe
     - rabbitmq
   roles:

doc/ironic-guide.rst

@@ -7,7 +7,7 @@ Currently Kolla can deploy the Ironic services:
 
 - ironic-api
 - ironic-conductor
-- ironic-discoverd
+- ironic-inspector
 
 As well as a required PXE service, deployed as ironic-pxe.
 
@@ -15,8 +15,7 @@ Current status
 --------------
 The Ironic implementation is "tech preview", so currently instances can only be
 deployed on baremetal. Further work will be done to allow scheduling for both
-virtualized and baremetal deployments. Most probably at that time discoverd
+virtualized and baremetal deployments.
-will be replaced by ironic-inspector.
 
 Post-deployment configuration
 -----------------------------

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

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
+RUN yum -y install \
-# discoverd no longer in delorean 9/28/2015, switch to inspector on TODO
+    openstack-ironic-inspector \
-#RUN yum -y install \
+    && yum clean all
-#    openstack-ironic-discoverd \
-#    && yum clean all
 
     {% endif %}
 {% endif %}

tests/test_build.py

@@ -70,7 +70,7 @@ class BuildTestCentosBinary(BuildTest, base.BaseTestCase):
     excluded_images = ["gnocchi-base",
                        "murano-base",
                        "ironic-pxe",
-                       "ironic-discoverd",
+                       "ironic-inspector",
                        "mistral-base",
                        "murano-base"]
 
@@ -84,7 +84,7 @@ class BuildTestCentosSource(BuildTest, base.BaseTestCase):
     excluded_images = ["gnocchi-base",
                        "murano-base",
                        "ironic-pxe",
-                       "ironic-discoverd",
+                       "ironic-inspector",
                        "mistral-base"]
 
     def setUp(self):

tools/cleanup-containers

@@ -17,7 +17,7 @@ else
         haproxy \
         heat_{api{,_cfn},engine} \
         horizon \
-        ironic_{discoverd,conductor,api,pxe} \
+        ironic_{inspector,conductor,api,pxe} \
         keepalived \
         keystone \
         kolla_toolbox \