Skip to content

Commit 1dc4ed8

Browse files
committed
fix indentation
1 parent 169ac90 commit 1dc4ed8

File tree

7 files changed

+77
-77
lines changed

7 files changed

+77
-77
lines changed

etc/kayobe/environments/stackhpc-baremetal/ansible/baremetal-0-enroll-baremetal.yml

Lines changed: 52 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22

33
- name: Register baremetal compute nodes
4-
hosts: "{{ groups['controllers'][0] }}"
4+
hosts: "{{ groups['controllers'][0] }}"
55
vars:
66
venv: "{{ virtualenv_path }}/openstack-cli"
77
tasks:
@@ -40,59 +40,59 @@
4040
fail_msg: One or more Ironic variables are undefined.
4141

4242
- block:
43-
- name: Show baremetal node
44-
ansible.builtin.command:
45-
cmd: "{{ venv }}/bin/openstack baremetal node show {{ inventory_hostname }}"
46-
register: node_show
47-
failed_when:
48-
- '"HTTP 404" not in node_show.stderr'
49-
- node_show.rc != 0
50-
changed_when: false
43+
- name: Show baremetal node
44+
ansible.builtin.command:
45+
cmd: "{{ venv }}/bin/openstack baremetal node show {{ inventory_hostname }}"
46+
register: node_show
47+
failed_when:
48+
- '"HTTP 404" not in node_show.stderr'
49+
- node_show.rc != 0
50+
changed_when: false
5151

52-
# NOTE: The openstack.cloud.baremetal_node module cannot be used in this
53-
# script due to requiring a MAC address pre-defined, instead, this should
54-
# be discovered by inpsection following this script.
55-
#
56-
# NOTE: IPMI address must be passed with Redfish address to ensure existing
57-
# Ironic nodes match with new nodes during inspection.
58-
- name: Create baremetal nodes
59-
ansible.builtin.shell:
60-
cmd: |
61-
{{ venv }}/bin/openstack baremetal node create \
62-
--name {{ inventory_hostname }} \
63-
--driver {{ ironic_driver }} \
64-
--driver-info redfish_system_id={{ ironic_redfish_system_id }} \
65-
--driver-info redfish_address={{ ironic_redfish_address }} \
66-
--driver-info redfish_username={{ ironic_redfish_username }} \
67-
--driver-info redfish_password={{ ironic_redfish_password }} \
68-
--driver-info redfish_verify_ca={{ ironic_redfish_verify_ca }} \
69-
{% for key, value in ironic_properties.items() %}
70-
--property {{ key }}={{ value }} \
71-
{% endfor %}
72-
--resource-class {{ ironic_resource_class }}
73-
{% if ironic_boot_interface %}
74-
--boot-interface {{ ironic_boot_interface }}
75-
{% endif %}
76-
{% if ironic_inspect_interface %}
77-
--inspect-interface {{ ironic_inspect_interface }}
78-
{% endif %}
79-
{% if ironic_management_interface %}
80-
--management-interface {{ ironic_management_interface }}
81-
{% endif %}
82-
{% if ironic_network_interface %}
83-
--network-interface {{ ironic_network_interface }}
84-
{% endif %}
85-
{% if ironic_raid_interface %}
86-
--raid-interface {{ ironic_raid_interface }}
87-
{% endif %}
88-
when:
89-
- node_show.rc != 0
52+
# NOTE: The openstack.cloud.baremetal_node module cannot be used in this
53+
# script due to requiring a MAC address pre-defined, instead, this should
54+
# be discovered by inpsection following this script.
55+
#
56+
# NOTE: IPMI address must be passed with Redfish address to ensure existing
57+
# Ironic nodes match with new nodes during inspection.
58+
- name: Create baremetal nodes
59+
ansible.builtin.shell:
60+
cmd: |
61+
{{ venv }}/bin/openstack baremetal node create \
62+
--name {{ inventory_hostname }} \
63+
--driver {{ ironic_driver }} \
64+
--driver-info redfish_system_id={{ ironic_redfish_system_id }} \
65+
--driver-info redfish_address={{ ironic_redfish_address }} \
66+
--driver-info redfish_username={{ ironic_redfish_username }} \
67+
--driver-info redfish_password={{ ironic_redfish_password }} \
68+
--driver-info redfish_verify_ca={{ ironic_redfish_verify_ca }} \
69+
{% for key, value in ironic_properties.items() %}
70+
--property {{ key }}={{ value }} \
71+
{% endfor %}
72+
--resource-class {{ ironic_resource_class }}
73+
{% if ironic_boot_interface %}
74+
--boot-interface {{ ironic_boot_interface }}
75+
{% endif %}
76+
{% if ironic_inspect_interface %}
77+
--inspect-interface {{ ironic_inspect_interface }}
78+
{% endif %}
79+
{% if ironic_management_interface %}
80+
--management-interface {{ ironic_management_interface }}
81+
{% endif %}
82+
{% if ironic_network_interface %}
83+
--network-interface {{ ironic_network_interface }}
84+
{% endif %}
85+
{% if ironic_raid_interface %}
86+
--raid-interface {{ ironic_raid_interface }}
87+
{% endif %}
88+
when:
89+
- node_show.rc != 0
9090

91-
- name: Manage baremetal nodes
92-
ansible.builtin.command:
93-
cmd: "{{ venv }}/bin/openstack baremetal node manage {{ inventory_hostname }} --wait"
94-
when:
95-
- node_show.rc != 0
91+
- name: Manage baremetal nodes
92+
ansible.builtin.command:
93+
cmd: "{{ venv }}/bin/openstack baremetal node manage {{ inventory_hostname }} --wait"
94+
when:
95+
- node_show.rc != 0
9696
delegate_to: "{{ controller_host }}"
9797
vars:
9898
# NOTE: Without this, the controller's ansible_host variable will not

etc/kayobe/environments/stackhpc-baremetal/ansible/baremetal-1-check-bmc-up.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@
7979
register: uri_output
8080
until: uri_output.status == 200
8181
delay: 2
82-
retries: 5 # Retries for 5 * 2 seconds = 10 seconds
82+
retries: 5 # Retries for 5 * 2 seconds = 10 seconds
8383

8484
- name: Note when we are able to reach the bmc, the first time
8585
ansible.builtin.command:

etc/kayobe/environments/stackhpc-baremetal/ansible/baremetal-3-ensure-agent-inspect.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
# NOTE: Without this, the controller's ansible_host variable will not
2121
# be respected when using delegate_to.
2222
ansible_host: "{{ hostvars[controller_host].ansible_host | default(controller_host) }}"
23-
agent_inspect_timeout: "{{ 60 * 20 }}" # 20 minutes
23+
agent_inspect_timeout: "{{ 60 * 20 }}" # 20 minutes
2424
environment: "{{ openstack_auth_env }}"
2525
block:
2626

etc/kayobe/environments/stackhpc-baremetal/ansible/provision-overcloud-nova.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -67,10 +67,10 @@
6767

6868
- name: Create key pair for baremetal
6969
openstack.cloud.keypair:
70-
state: present
71-
name: "{{ ironic_provision_key_name }}"
72-
# use the key kayobe is using to bootstrap with?
73-
public_key_file: "{{ ssh_public_key_path }}"
70+
state: present
71+
name: "{{ ironic_provision_key_name }}"
72+
# use the key kayobe is using to bootstrap with?
73+
public_key_file: "{{ ssh_public_key_path }}"
7474

7575
- name: Create port
7676
openstack.cloud.port:
@@ -98,7 +98,7 @@
9898
flavor: "{{ flavor }}"
9999
key_name: "{{ key_name }}"
100100
availability_zone: "::{{ bmnode.id }}"
101-
timeout: 1800 # wait 30 mins for build
101+
timeout: 1800 # wait 30 mins for build
102102
config_drive: yes
103103
delegate_to: localhost
104104
register: server

etc/kayobe/environments/stackhpc-baremetal/ansible/recover-baremetal.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
register: uri_output
4545
until: uri_output.status == 200
4646
delay: 5
47-
retries: 24 # Retries for 24 * 5 seconds = 120 seconds = 2 minutes
47+
retries: 24 # Retries for 24 * 5 seconds = 120 seconds = 2 minutes
4848
when: bmnode_prov in ['deploy failed', 'error', 'clean failed']
4949

5050
- name: Manage baremetals in 'clean failed' state

etc/kayobe/environments/stackhpc-baremetal/ironic.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# Ironic configuration.
44

55
# Specify the list of hardware types to load during service initialization.
6-
kolla_ironic_enabled_hardware_types:
6+
kolla_ironic_enabled_hardware_types:
77
- redfish
88

99
# Specify the list of bios interfaces to load during service initialization.
@@ -65,7 +65,7 @@ kolla_ironic_enabled_network_interfaces:
6565
kolla_ironic_default_network_interface: neutron
6666

6767
# Specify the list of power interfaces to load during service initialization.
68-
kolla_ironic_enabled_power_interfaces:
68+
kolla_ironic_enabled_power_interfaces:
6969
- redfish
7070

7171
# Default power interface to be used for nodes that do not have power_interface
Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
---
22
kolla_overcloud_inventory_top_level_group_map:
3-
compute:
4-
groups:
5-
- "compute_baremetal"
6-
control:
7-
groups:
8-
- "controllers"
9-
monitoring:
10-
groups:
11-
- "controllers"
12-
network:
13-
groups:
14-
- "controllers"
15-
storage:
16-
groups:
17-
- "controllers"
3+
compute:
4+
groups:
5+
- "compute_baremetal"
6+
control:
7+
groups:
8+
- "controllers"
9+
monitoring:
10+
groups:
11+
- "controllers"
12+
network:
13+
groups:
14+
- "controllers"
15+
storage:
16+
groups:
17+
- "controllers"

0 commit comments

Comments
 (0)