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
This commit is contained in:
Mark Goddard 2017-11-13 19:15:48 +00:00
parent 744345f737
commit c33d2a4e0e
7 changed files with 60 additions and 17 deletions

View File

@ -323,7 +323,7 @@ inspector_dell_switch_lldp_workaround_group:
# data which may be useful in environments without Swift.
# 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.
inspector_store_port: 8080

View File

@ -1,6 +1,6 @@
---
- name: Ensure Ironic is enabled
- name: Check whether Ironic is enabled
hosts: controllers
tasks:
- name: Create controllers group with ironic enabled
@ -146,17 +146,19 @@
}}
with_items: "{{ kolla_neutron_ml2_generic_switch_hosts }}"
- name: Set facts containing IPA kernel and ramdisk URLs
set_fact:
kolla_inspector_ipa_kernel_upstream_url: "{{ inspector_ipa_kernel_upstream_url }}"
kolla_inspector_ipa_ramdisk_upstream_url: "{{ inspector_ipa_ramdisk_upstream_url }}"
when: not ipa_build_images | bool
- block:
- name: Set facts containing IPA kernel and ramdisk URLs
set_fact:
kolla_inspector_ipa_kernel_upstream_url: "{{ inspector_ipa_kernel_upstream_url }}"
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
set_fact:
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 }}"
when: ipa_build_images | bool
- name: Set facts containing IPA kernel and ramdisk paths
set_fact:
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 }}"
when: ipa_build_images | bool
when: kolla_enable_ironic | bool
tags:
- config
roles:

View File

@ -8,8 +8,16 @@
# each ironic node that matches against the switch system and the relevant
# 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
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:
- name: Group controller hosts in systems requiring the Dell switch LLDP workaround
group_by:
@ -18,6 +26,7 @@
- name: Ensure introspection rules for Dell switch LLDP workarounds are registered in Ironic Inspector
# Only required to run on a single host.
hosts: controllers_require_workaround_True[0]
gather_facts: False
vars:
all_switch_interfaces: []
ironic_inspector_rules: []

View File

@ -1,7 +1,15 @@
---
- 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
# Only required to run on a single host.
hosts: controllers[0]
hosts: controllers_with_ironic_enabled_True[0]
gather_facts: False
vars:
venv: "{{ virtualenv_path }}/shade"
pre_tasks:

View File

@ -4,8 +4,16 @@
#
# 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
hosts: controllers[0]
hosts: controllers_with_ironic_enabled_True[0]
gather_facts: False
vars:
ipa_image_name: "ipa"
tasks:

View File

@ -1,6 +1,14 @@
---
- 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
hosts: controllers[0]
hosts: controllers_with_ironic_enabled_True[0]
gather_facts: False
vars:
# These are the filenames generated by overcloud-ipa-build.yml.
ipa_image_name: "ipa"

View File

@ -1,7 +1,15 @@
---
- 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
# Only required to run on a single host.
hosts: controllers[0]
hosts: controllers_with_ironic_enabled_True[0]
gather_facts: False
pre_tasks:
- name: Validate OpenStack password authentication parameters
fail: