openstack/kolla-ansible
Code Issues Proposed changes

Merge "Use bool filter with enable_ironic_pxe_uefi"

Browse Source
This commit is contained in:
Zuul 2018-01-26 05:03:59 +00:00 committed by Gerrit Code Review
commit 02fa35dc8e
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ansible/roles/ironic/tasks/config.yml
View File

@ -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 @@
# 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:

4
ansible/roles/ironic/tasks/precheck.yml
View File

@ -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 @@
# 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"

2
ansible/roles/ironic/templates/ironic-pxe.json.j2
View File

@ -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",