diff --git a/roles/ironic-enroll/tasks/ipmi_bridging_dual_enroll.yaml b/roles/ironic-enroll/tasks/ipmi_bridging_dual_enroll.yaml index 43878f968..c57e158bf 100644 --- a/roles/ironic-enroll/tasks/ipmi_bridging_dual_enroll.yaml +++ b/roles/ironic-enroll/tasks/ipmi_bridging_dual_enroll.yaml @@ -12,53 +12,53 @@ # See the License for the specific language governing permissions and # limitations under the License. --- - - name: "Enroll Hardware" - # The variable definitions below seem far from ideal, however there - # seems to be no better way to handle CSV files for looping at this time. - # - # Ideally with_lines would be used with an include, however that support was removed in - # Ansible 1.6 and no direct replacement exists. - # - # mac_address: "{{item.split(',')[1]}}" - # username: "{{item.split(',')[2]}}" - # password: "{{item.split(',')[3]}}" - # management_address: "{{item.split(',')[4]}}" - # cpu_cores: "{{item.split(',')[5]}}" - # memory_MB: "{{item.split(',')[6]}}" - # disk_MB: "{{item.split(',')[7]}}" - # ipmi_target_channel: "{{item.split(',')[12]}}" - # ipmi_target_address: "{{item.split(',')[13]}}" - # ipmi_transit_channel: "{{item.split(',')[14]}}" - # ipmi_transit_address: "{{item.split(',')[15]}}" - # - os_ironic: - auth_plugin: None - auth: None - ironic_url: "{{ ironic_url }}" - driver: "agent_ipmitool" - # UUID determination TBD for mass enrollment. - uuid: "{{item.split(',')[9]}}" - state: present - nics: - - mac: "{{item.split(',')[0]}}" - properties: - cpus: "{{item.split(',')[4]}}" - cpu_arch: "x86_64" - ram: "{{item.split(',')[5]}}" - disk_size: "{{item.split(',')[6]}}" - driver_info: - power: - ipmi_address: "{{item.split(',')[3]}}" - ipmi_username: "{{item.split(',')[1]}}" - ipmi_password: "{{item.split(',')[2]}}" - ipmi_bridging: "dual" - ipmi_target_channel: "{{item.split(',')[12]}}" - ipmi_target_address: "{{item.split(',')[13]}}" - ipmi_transit_channel: "{{item.split(',')[14]}}" - ipmi_transit_address: "{{item.split(',')[15]}}" - deploy: - deploy_kernel: "{{ deploy_kernel_url }}" - deploy_ramdisk: "{{ deploy_ramdisk_url }}" - delegate_to: localhost - with_lines: - - cat {{ baremetal_csv_file }} +- name: "Enroll Hardware" + # The variable definitions below seem far from ideal, however there + # seems to be no better way to handle CSV files for looping at this time. + # + # Ideally with_lines would be used with an include, however that support was removed in + # Ansible 1.6 and no direct replacement exists. + # + # mac_address: "{{item.split(',')[1]}}" + # username: "{{item.split(',')[2]}}" + # password: "{{item.split(',')[3]}}" + # management_address: "{{item.split(',')[4]}}" + # cpu_cores: "{{item.split(',')[5]}}" + # memory_MB: "{{item.split(',')[6]}}" + # disk_MB: "{{item.split(',')[7]}}" + # ipmi_target_channel: "{{item.split(',')[12]}}" + # ipmi_target_address: "{{item.split(',')[13]}}" + # ipmi_transit_channel: "{{item.split(',')[14]}}" + # ipmi_transit_address: "{{item.split(',')[15]}}" + # + os_ironic: + auth_plugin: None + auth: None + ironic_url: "{{ ironic_url }}" + driver: "agent_ipmitool" + # UUID determination TBD for mass enrollment. + uuid: "{{item.split(',')[9]}}" + state: present + nics: + - mac: "{{item.split(',')[0]}}" + properties: + cpus: "{{item.split(',')[4]}}" + cpu_arch: "x86_64" + ram: "{{item.split(',')[5]}}" + disk_size: "{{item.split(',')[6]}}" + driver_info: + power: + ipmi_address: "{{item.split(',')[3]}}" + ipmi_username: "{{item.split(',')[1]}}" + ipmi_password: "{{item.split(',')[2]}}" + ipmi_bridging: "dual" + ipmi_target_channel: "{{item.split(',')[12]}}" + ipmi_target_address: "{{item.split(',')[13]}}" + ipmi_transit_channel: "{{item.split(',')[14]}}" + ipmi_transit_address: "{{item.split(',')[15]}}" + deploy: + deploy_kernel: "{{ deploy_kernel_url }}" + deploy_ramdisk: "{{ deploy_ramdisk_url }}" + delegate_to: localhost + with_lines: + - cat {{ baremetal_csv_file }} diff --git a/roles/ironic-enroll/tasks/ipmi_bridging_single_enroll.yaml b/roles/ironic-enroll/tasks/ipmi_bridging_single_enroll.yaml index 1bc474408..549c5614d 100644 --- a/roles/ironic-enroll/tasks/ipmi_bridging_single_enroll.yaml +++ b/roles/ironic-enroll/tasks/ipmi_bridging_single_enroll.yaml @@ -12,48 +12,48 @@ # See the License for the specific language governing permissions and # limitations under the License. --- - - name: "Enroll Hardware" - # The variable definitions below seem far from ideal, however there - # seems to be no better way to handle CSV files for looping at this time. - # - # Ideally with_lines would be used with an include, however that support was removed in - # Ansible 1.6 and no direct replacement exists. - # - # mac_address: "{{item.split(',')[1]}}" - # username: "{{item.split(',')[2]}}" - # password: "{{item.split(',')[3]}}" - # management_address: "{{item.split(',')[4]}}" - # cpu_cores: "{{item.split(',')[5]}}" - # memory_MB: "{{item.split(',')[6]}}" - # disk_MB: "{{item.split(',')[7]}}" - # ipmi_target_channel: "{{item.split(',')[12]}}" - # ipmi_target_address: "{{item.split(',')[13]}}" - os_ironic: - auth_plugin: None - auth: None - ironic_url: "{{ ironic_url }}" - driver: "agent_ipmitool" - # UUID determination TBD for mass enrollment. - uuid: "{{item.split(',')[9]}}" - state: present - nics: - - mac: "{{item.split(',')[0]}}" - properties: - cpus: "{{item.split(',')[4]}}" - cpu_arch: "x86_64" - ram: "{{item.split(',')[5]}}" - disk_size: "{{item.split(',')[6]}}" - driver_info: - power: - ipmi_address: "{{item.split(',')[3]}}" - ipmi_username: "{{item.split(',')[1]}}" - ipmi_password: "{{item.split(',')[2]}}" - ipmi_bridging: "single" - ipmi_target_channel: "{{item.split(',')[12]}}" - ipmi_target_address: "{{item.split(',')[13]}}" - deploy: - deploy_kernel: "{{ deploy_kernel_url }}" - deploy_ramdisk: "{{ deploy_ramdisk_url }}" - delegate_to: localhost - with_lines: - - cat {{ baremetal_csv_file }} +- name: "Enroll Hardware" + # The variable definitions below seem far from ideal, however there + # seems to be no better way to handle CSV files for looping at this time. + # + # Ideally with_lines would be used with an include, however that support was removed in + # Ansible 1.6 and no direct replacement exists. + # + # mac_address: "{{item.split(',')[1]}}" + # username: "{{item.split(',')[2]}}" + # password: "{{item.split(',')[3]}}" + # management_address: "{{item.split(',')[4]}}" + # cpu_cores: "{{item.split(',')[5]}}" + # memory_MB: "{{item.split(',')[6]}}" + # disk_MB: "{{item.split(',')[7]}}" + # ipmi_target_channel: "{{item.split(',')[12]}}" + # ipmi_target_address: "{{item.split(',')[13]}}" + os_ironic: + auth_plugin: None + auth: None + ironic_url: "{{ ironic_url }}" + driver: "agent_ipmitool" + # UUID determination TBD for mass enrollment. + uuid: "{{item.split(',')[9]}}" + state: present + nics: + - mac: "{{item.split(',')[0]}}" + properties: + cpus: "{{item.split(',')[4]}}" + cpu_arch: "x86_64" + ram: "{{item.split(',')[5]}}" + disk_size: "{{item.split(',')[6]}}" + driver_info: + power: + ipmi_address: "{{item.split(',')[3]}}" + ipmi_username: "{{item.split(',')[1]}}" + ipmi_password: "{{item.split(',')[2]}}" + ipmi_bridging: "single" + ipmi_target_channel: "{{item.split(',')[12]}}" + ipmi_target_address: "{{item.split(',')[13]}}" + deploy: + deploy_kernel: "{{ deploy_kernel_url }}" + deploy_ramdisk: "{{ deploy_ramdisk_url }}" + delegate_to: localhost + with_lines: + - cat {{ baremetal_csv_file }} diff --git a/roles/ironic-enroll/tasks/standard_enroll.yaml b/roles/ironic-enroll/tasks/standard_enroll.yaml index f13096b03..b079899fb 100644 --- a/roles/ironic-enroll/tasks/standard_enroll.yaml +++ b/roles/ironic-enroll/tasks/standard_enroll.yaml @@ -12,43 +12,43 @@ # See the License for the specific language governing permissions and # limitations under the License. --- - - name: "Enroll Hardware" - # The variable definitions below seem far from ideal, however there - # seems to be no better way to handle CSV files for looping at this time. - # - # Ideally with_lines would be used with an include, however that support was removed in - # Ansible 1.6 and no direct replacement exists. - # - # mac_address: "{{item.split(',')[1]}}" - # username: "{{item.split(',')[2]}}" - # password: "{{item.split(',')[3]}}" - # management_address: "{{item.split(',')[4]}}" - # cpu_cores: "{{item.split(',')[5]}}" - # memory_MB: "{{item.split(',')[6]}}" - # disk_MB: "{{item.split(',')[7]}}" - os_ironic: - auth_plugin: None - auth: None - ironic_url: "{{ ironic_url }}" - driver: "agent_ipmitool" - # UUID determination TBD for mass enrollment. - uuid: "{{item.split(',')[9]}}" - state: present - nics: - - mac: "{{item.split(',')[0]}}" - properties: - cpus: "{{item.split(',')[4]}}" - cpu_arch: "x86_64" - ram: "{{item.split(',')[5]}}" - disk_size: "{{item.split(',')[6]}}" - driver_info: - power: - ipmi_address: "{{item.split(',')[3]}}" - ipmi_username: "{{item.split(',')[1]}}" - ipmi_password: "{{item.split(',')[2]}}" - deploy: - deploy_kernel: "{{ deploy_kernel_url }}" - deploy_ramdisk: "{{ deploy_ramdisk_url }}" - delegate_to: localhost - with_lines: - - cat {{ baremetal_csv_file }} +- name: "Enroll Hardware" + # The variable definitions below seem far from ideal, however there + # seems to be no better way to handle CSV files for looping at this time. + # + # Ideally with_lines would be used with an include, however that support was removed in + # Ansible 1.6 and no direct replacement exists. + # + # mac_address: "{{item.split(',')[1]}}" + # username: "{{item.split(',')[2]}}" + # password: "{{item.split(',')[3]}}" + # management_address: "{{item.split(',')[4]}}" + # cpu_cores: "{{item.split(',')[5]}}" + # memory_MB: "{{item.split(',')[6]}}" + # disk_MB: "{{item.split(',')[7]}}" + os_ironic: + auth_plugin: None + auth: None + ironic_url: "{{ ironic_url }}" + driver: "agent_ipmitool" + # UUID determination TBD for mass enrollment. + uuid: "{{item.split(',')[9]}}" + state: present + nics: + - mac: "{{item.split(',')[0]}}" + properties: + cpus: "{{item.split(',')[4]}}" + cpu_arch: "x86_64" + ram: "{{item.split(',')[5]}}" + disk_size: "{{item.split(',')[6]}}" + driver_info: + power: + ipmi_address: "{{item.split(',')[3]}}" + ipmi_username: "{{item.split(',')[1]}}" + ipmi_password: "{{item.split(',')[2]}}" + deploy: + deploy_kernel: "{{ deploy_kernel_url }}" + deploy_ramdisk: "{{ deploy_ramdisk_url }}" + delegate_to: localhost + with_lines: + - cat {{ baremetal_csv_file }}