Skip to content
Snippets Groups Projects
Commit c33d2a4e authored by Mark Goddard's avatar Mark Goddard
Browse files

Don't run baremetal compute tasks when ironic is disabled

This includes:
* Building and registering IPA images
* Registering a provisioning network
* Registering ironic inspector introspection rules
* Creating an inspection store container
parent 744345f7
No related branches found
No related tags found
No related merge requests found
...@@ -323,7 +323,7 @@ inspector_dell_switch_lldp_workaround_group: ...@@ -323,7 +323,7 @@ inspector_dell_switch_lldp_workaround_group:
# data which may be useful in environments without Swift. # data which may be useful in environments without Swift.
# Whether the inspection data store is enabled. # Whether the inspection data store is enabled.
inspector_store_enabled: "{{ not kolla_enable_swift | bool }}" inspector_store_enabled: "{{ kolla_enable_ironic | bool and not kolla_enable_swift | bool }}"
# Port on which the inspection data store should listen. # Port on which the inspection data store should listen.
inspector_store_port: 8080 inspector_store_port: 8080
--- ---
- name: Ensure Ironic is enabled - name: Check whether Ironic is enabled
hosts: controllers hosts: controllers
tasks: tasks:
- name: Create controllers group with ironic enabled - name: Create controllers group with ironic enabled
...@@ -146,17 +146,19 @@ ...@@ -146,17 +146,19 @@
}} }}
with_items: "{{ kolla_neutron_ml2_generic_switch_hosts }}" with_items: "{{ kolla_neutron_ml2_generic_switch_hosts }}"
- name: Set facts containing IPA kernel and ramdisk URLs - block:
set_fact: - name: Set facts containing IPA kernel and ramdisk URLs
kolla_inspector_ipa_kernel_upstream_url: "{{ inspector_ipa_kernel_upstream_url }}" set_fact:
kolla_inspector_ipa_ramdisk_upstream_url: "{{ inspector_ipa_ramdisk_upstream_url }}" kolla_inspector_ipa_kernel_upstream_url: "{{ inspector_ipa_kernel_upstream_url }}"
when: not ipa_build_images | bool kolla_inspector_ipa_ramdisk_upstream_url: "{{ inspector_ipa_ramdisk_upstream_url }}"
when: not ipa_build_images | bool
- name: Set facts containing IPA kernel and ramdisk paths - name: Set facts containing IPA kernel and ramdisk paths
set_fact: set_fact:
kolla_inspector_ipa_kernel_path: "{{ image_cache_path }}/{{ ipa_image_name }}/{{ ipa_images_kernel_name }}" kolla_inspector_ipa_kernel_path: "{{ image_cache_path }}/{{ ipa_image_name }}/{{ ipa_images_kernel_name }}"
kolla_inspector_ipa_ramdisk_path: "{{ image_cache_path }}/{{ ipa_image_name }}/{{ ipa_images_ramdisk_name }}" kolla_inspector_ipa_ramdisk_path: "{{ image_cache_path }}/{{ ipa_image_name }}/{{ ipa_images_ramdisk_name }}"
when: ipa_build_images | bool when: ipa_build_images | bool
when: kolla_enable_ironic | bool
tags: tags:
- config - config
roles: roles:
......
...@@ -8,8 +8,16 @@ ...@@ -8,8 +8,16 @@
# each ironic node that matches against the switch system and the relevant # each ironic node that matches against the switch system and the relevant
# interface name, then sets the node's name appropriately. # interface name, then sets the node's name appropriately.
- name: Group controller hosts in systems requiring the workaround - name: Check whether Ironic is enabled
hosts: controllers hosts: controllers
tasks:
- name: Create controllers group with ironic enabled
group_by:
key: "controllers_with_ironic_enabled_{{ kolla_enable_ironic }}"
- name: Group controller hosts in systems requiring the workaround
hosts: controllers_with_ironic_enabled_True
gather_facts: False
tasks: tasks:
- name: Group controller hosts in systems requiring the Dell switch LLDP workaround - name: Group controller hosts in systems requiring the Dell switch LLDP workaround
group_by: group_by:
...@@ -18,6 +26,7 @@ ...@@ -18,6 +26,7 @@
- name: Ensure introspection rules for Dell switch LLDP workarounds are registered in Ironic Inspector - name: Ensure introspection rules for Dell switch LLDP workarounds are registered in Ironic Inspector
# Only required to run on a single host. # Only required to run on a single host.
hosts: controllers_require_workaround_True[0] hosts: controllers_require_workaround_True[0]
gather_facts: False
vars: vars:
all_switch_interfaces: [] all_switch_interfaces: []
ironic_inspector_rules: [] ironic_inspector_rules: []
......
--- ---
- name: Check whether Ironic is enabled
hosts: controllers
tasks:
- name: Create controllers group with ironic enabled
group_by:
key: "controllers_with_ironic_enabled_{{ kolla_enable_ironic }}"
- name: Ensure introspection rules are registered in Ironic Inspector - name: Ensure introspection rules are registered in Ironic Inspector
# Only required to run on a single host. # Only required to run on a single host.
hosts: controllers[0] hosts: controllers_with_ironic_enabled_True[0]
gather_facts: False
vars: vars:
venv: "{{ virtualenv_path }}/shade" venv: "{{ virtualenv_path }}/shade"
pre_tasks: pre_tasks:
......
...@@ -4,8 +4,16 @@ ...@@ -4,8 +4,16 @@
# #
# The images will be stored in {{ image_cache_path }}/{{ ipa_image_name }}. # The images will be stored in {{ image_cache_path }}/{{ ipa_image_name }}.
- name: Check whether Ironic is enabled
hosts: controllers
tasks:
- name: Create controllers group with ironic enabled
group_by:
key: "controllers_with_ironic_enabled_{{ kolla_enable_ironic }}"
- name: Ensure Ironic Python Agent images are built and installed - name: Ensure Ironic Python Agent images are built and installed
hosts: controllers[0] hosts: controllers_with_ironic_enabled_True[0]
gather_facts: False
vars: vars:
ipa_image_name: "ipa" ipa_image_name: "ipa"
tasks: tasks:
......
--- ---
- name: Check whether Ironic is enabled
hosts: controllers
tasks:
- name: Create controllers group with ironic enabled
group_by:
key: "controllers_with_ironic_enabled_{{ kolla_enable_ironic }}"
- name: Ensure Ironic Python Agent (IPA) images are downloaded and registered - name: Ensure Ironic Python Agent (IPA) images are downloaded and registered
hosts: controllers[0] hosts: controllers_with_ironic_enabled_True[0]
gather_facts: False
vars: vars:
# These are the filenames generated by overcloud-ipa-build.yml. # These are the filenames generated by overcloud-ipa-build.yml.
ipa_image_name: "ipa" ipa_image_name: "ipa"
......
--- ---
- name: Check whether Ironic is enabled
hosts: controllers
tasks:
- name: Create controllers group with ironic enabled
group_by:
key: "controllers_with_ironic_enabled_{{ kolla_enable_ironic }}"
- name: Ensure provisioning network and subnet are registered in neutron - name: Ensure provisioning network and subnet are registered in neutron
# Only required to run on a single host. # Only required to run on a single host.
hosts: controllers[0] hosts: controllers_with_ironic_enabled_True[0]
gather_facts: False
pre_tasks: pre_tasks:
- name: Validate OpenStack password authentication parameters - name: Validate OpenStack password authentication parameters
fail: fail:
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment