Skip to content
Snippets Groups Projects
Commit 02fa35dc authored by Zuul's avatar Zuul Committed by Gerrit Code Review
Browse files

Merge "Use bool filter with enable_ironic_pxe_uefi"

parents 39d9327d 98a4b448
No related branches found
No related tags found
No related merge requests found
...@@ -89,7 +89,7 @@ ...@@ -89,7 +89,7 @@
# Only required when Ironic inspector is in use. # Only required when Ironic inspector is in use.
- groups['ironic-inspector'] | length > 0 - groups['ironic-inspector'] | length > 0
- inventory_hostname in groups['ironic-pxe'] - inventory_hostname in groups['ironic-pxe']
- not enable_ironic_pxe_uefi - not enable_ironic_pxe_uefi | bool
- name: Copying ironic_pxe_uefi.cfg default - name: Copying ironic_pxe_uefi.cfg default
template: template:
...@@ -114,7 +114,7 @@ ...@@ -114,7 +114,7 @@
# Only required when Ironic inspector is in use. # Only required when Ironic inspector is in use.
- groups['ironic-inspector'] | length > 0 - groups['ironic-inspector'] | length > 0
- inventory_hostname in groups['ironic-pxe'] - inventory_hostname in groups['ironic-pxe']
- not enable_ironic_pxe_uefi - not enable_ironic_pxe_uefi | bool
- name: Copying over existing policy file - name: Copying over existing policy file
template: template:
......
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
- container_facts['ironic_inspector'] is not defined - container_facts['ironic_inspector'] is not defined
- inventory_hostname in groups['ironic-inspector'] - inventory_hostname in groups['ironic-inspector']
- name: Checking ironic-agent files exist for Ironic - name: Checking ironic-agent files exist for Ironic Inspector
local_action: stat path="{{ node_custom_config }}/ironic/{{ item }}" local_action: stat path="{{ node_custom_config }}/ironic/{{ item }}"
run_once: True run_once: True
register: result register: result
...@@ -37,7 +37,7 @@ ...@@ -37,7 +37,7 @@
# Only required when Ironic inspector is in use. # Only required when Ironic inspector is in use.
- groups['ironic-inspector'] | length > 0 - groups['ironic-inspector'] | length > 0
- inventory_hostname in groups['ironic-pxe'] - inventory_hostname in groups['ironic-pxe']
- not enable_ironic_pxe_uefi - not enable_ironic_pxe_uefi | bool
with_items: with_items:
- "ironic-agent.kernel" - "ironic-agent.kernel"
- "ironic-agent.initramfs" - "ironic-agent.initramfs"
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
"command": "/usr/sbin/in.tftpd --verbose --foreground --user root --address 0.0.0.0:69 --map-file /map-file /tftpboot", "command": "/usr/sbin/in.tftpd --verbose --foreground --user root --address 0.0.0.0:69 --map-file /map-file /tftpboot",
"config_files": [ "config_files": [
{% if groups['ironic-inspector'] | length > 0 %} {% if groups['ironic-inspector'] | length > 0 %}
{% if not enable_ironic_pxe_uefi %} {% if not enable_ironic_pxe_uefi | bool %}
{ {
"source": "{{ container_config_directory }}/ironic-agent.kernel", "source": "{{ container_config_directory }}/ironic-agent.kernel",
"dest": "/tftpboot/ironic-agent.kernel", "dest": "/tftpboot/ironic-agent.kernel",
......
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