openstack/bifrost
Code Issues Proposed changes

Remove excess spacing in enroll yaml files

Browse Source 
Removed excess spaces at the beginning of the lines of the enroll
yaml files to ensure that they are cleaner moving forward.
This commit is contained in:
Julia Kreger 2015-03-16 12:10:52 -04:00
parent 61445fce51
commit db2dd9f17c
3 changed files with 135 additions and 135 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

100
roles/ironic-enroll/tasks/ipmi_bridging_dual_enroll.yaml
View File

@ -12,53 +12,53 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
--- ---
- name: "Enroll Hardware" - name: "Enroll Hardware"
# The variable definitions below seem far from ideal, however there # 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. # 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 # Ideally with_lines would be used with an include, however that support was removed in
# Ansible 1.6 and no direct replacement exists. # Ansible 1.6 and no direct replacement exists.
# #
# mac_address: "{{item.split(',')[1]}}" # mac_address: "{{item.split(',')[1]}}"
# username: "{{item.split(',')[2]}}" # username: "{{item.split(',')[2]}}"
# password: "{{item.split(',')[3]}}" # password: "{{item.split(',')[3]}}"
# management_address: "{{item.split(',')[4]}}" # management_address: "{{item.split(',')[4]}}"
# cpu_cores: "{{item.split(',')[5]}}" # cpu_cores: "{{item.split(',')[5]}}"
# memory_MB: "{{item.split(',')[6]}}" # memory_MB: "{{item.split(',')[6]}}"
# disk_MB: "{{item.split(',')[7]}}" # disk_MB: "{{item.split(',')[7]}}"
# ipmi_target_channel: "{{item.split(',')[12]}}" # ipmi_target_channel: "{{item.split(',')[12]}}"
# ipmi_target_address: "{{item.split(',')[13]}}" # ipmi_target_address: "{{item.split(',')[13]}}"
# ipmi_transit_channel: "{{item.split(',')[14]}}" # ipmi_transit_channel: "{{item.split(',')[14]}}"
# ipmi_transit_address: "{{item.split(',')[15]}}" # ipmi_transit_address: "{{item.split(',')[15]}}"
# #
os_ironic: os_ironic:
auth_plugin: None auth_plugin: None
auth: None auth: None
ironic_url: "{{ ironic_url }}" ironic_url: "{{ ironic_url }}"
driver: "agent_ipmitool" driver: "agent_ipmitool"
# UUID determination TBD for mass enrollment. # UUID determination TBD for mass enrollment.
uuid: "{{item.split(',')[9]}}" uuid: "{{item.split(',')[9]}}"
state: present state: present
nics: nics:
- mac: "{{item.split(',')[0]}}" - mac: "{{item.split(',')[0]}}"
properties: properties:
cpus: "{{item.split(',')[4]}}" cpus: "{{item.split(',')[4]}}"
cpu_arch: "x86_64" cpu_arch: "x86_64"
ram: "{{item.split(',')[5]}}" ram: "{{item.split(',')[5]}}"
disk_size: "{{item.split(',')[6]}}" disk_size: "{{item.split(',')[6]}}"
driver_info: driver_info:
power: power:
ipmi_address: "{{item.split(',')[3]}}" ipmi_address: "{{item.split(',')[3]}}"
ipmi_username: "{{item.split(',')[1]}}" ipmi_username: "{{item.split(',')[1]}}"
ipmi_password: "{{item.split(',')[2]}}" ipmi_password: "{{item.split(',')[2]}}"
ipmi_bridging: "dual" ipmi_bridging: "dual"
ipmi_target_channel: "{{item.split(',')[12]}}" ipmi_target_channel: "{{item.split(',')[12]}}"
ipmi_target_address: "{{item.split(',')[13]}}" ipmi_target_address: "{{item.split(',')[13]}}"
ipmi_transit_channel: "{{item.split(',')[14]}}" ipmi_transit_channel: "{{item.split(',')[14]}}"
ipmi_transit_address: "{{item.split(',')[15]}}" ipmi_transit_address: "{{item.split(',')[15]}}"
deploy: deploy:
deploy_kernel: "{{ deploy_kernel_url }}" deploy_kernel: "{{ deploy_kernel_url }}"
deploy_ramdisk: "{{ deploy_ramdisk_url }}" deploy_ramdisk: "{{ deploy_ramdisk_url }}"
delegate_to: localhost delegate_to: localhost
with_lines: with_lines:
- cat {{ baremetal_csv_file }} - cat {{ baremetal_csv_file }}

90
roles/ironic-enroll/tasks/ipmi_bridging_single_enroll.yaml
View File

@ -12,48 +12,48 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
--- ---
- name: "Enroll Hardware" - name: "Enroll Hardware"
# The variable definitions below seem far from ideal, however there # 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. # 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 # Ideally with_lines would be used with an include, however that support was removed in
# Ansible 1.6 and no direct replacement exists. # Ansible 1.6 and no direct replacement exists.
# #
# mac_address: "{{item.split(',')[1]}}" # mac_address: "{{item.split(',')[1]}}"
# username: "{{item.split(',')[2]}}" # username: "{{item.split(',')[2]}}"
# password: "{{item.split(',')[3]}}" # password: "{{item.split(',')[3]}}"
# management_address: "{{item.split(',')[4]}}" # management_address: "{{item.split(',')[4]}}"
# cpu_cores: "{{item.split(',')[5]}}" # cpu_cores: "{{item.split(',')[5]}}"
# memory_MB: "{{item.split(',')[6]}}" # memory_MB: "{{item.split(',')[6]}}"
# disk_MB: "{{item.split(',')[7]}}" # disk_MB: "{{item.split(',')[7]}}"
# ipmi_target_channel: "{{item.split(',')[12]}}" # ipmi_target_channel: "{{item.split(',')[12]}}"
# ipmi_target_address: "{{item.split(',')[13]}}" # ipmi_target_address: "{{item.split(',')[13]}}"
os_ironic: os_ironic:
auth_plugin: None auth_plugin: None
auth: None auth: None
ironic_url: "{{ ironic_url }}" ironic_url: "{{ ironic_url }}"
driver: "agent_ipmitool" driver: "agent_ipmitool"
# UUID determination TBD for mass enrollment. # UUID determination TBD for mass enrollment.
uuid: "{{item.split(',')[9]}}" uuid: "{{item.split(',')[9]}}"
state: present state: present
nics: nics:
- mac: "{{item.split(',')[0]}}" - mac: "{{item.split(',')[0]}}"
properties: properties:
cpus: "{{item.split(',')[4]}}" cpus: "{{item.split(',')[4]}}"
cpu_arch: "x86_64" cpu_arch: "x86_64"
ram: "{{item.split(',')[5]}}" ram: "{{item.split(',')[5]}}"
disk_size: "{{item.split(',')[6]}}" disk_size: "{{item.split(',')[6]}}"
driver_info: driver_info:
power: power:
ipmi_address: "{{item.split(',')[3]}}" ipmi_address: "{{item.split(',')[3]}}"
ipmi_username: "{{item.split(',')[1]}}" ipmi_username: "{{item.split(',')[1]}}"
ipmi_password: "{{item.split(',')[2]}}" ipmi_password: "{{item.split(',')[2]}}"
ipmi_bridging: "single" ipmi_bridging: "single"
ipmi_target_channel: "{{item.split(',')[12]}}" ipmi_target_channel: "{{item.split(',')[12]}}"
ipmi_target_address: "{{item.split(',')[13]}}" ipmi_target_address: "{{item.split(',')[13]}}"
deploy: deploy:
deploy_kernel: "{{ deploy_kernel_url }}" deploy_kernel: "{{ deploy_kernel_url }}"
deploy_ramdisk: "{{ deploy_ramdisk_url }}" deploy_ramdisk: "{{ deploy_ramdisk_url }}"
delegate_to: localhost delegate_to: localhost
with_lines: with_lines:
- cat {{ baremetal_csv_file }} - cat {{ baremetal_csv_file }}

80
roles/ironic-enroll/tasks/standard_enroll.yaml
View File

@ -12,43 +12,43 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
--- ---
- name: "Enroll Hardware" - name: "Enroll Hardware"
# The variable definitions below seem far from ideal, however there # 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. # 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 # Ideally with_lines would be used with an include, however that support was removed in
# Ansible 1.6 and no direct replacement exists. # Ansible 1.6 and no direct replacement exists.
# #
# mac_address: "{{item.split(',')[1]}}" # mac_address: "{{item.split(',')[1]}}"
# username: "{{item.split(',')[2]}}" # username: "{{item.split(',')[2]}}"
# password: "{{item.split(',')[3]}}" # password: "{{item.split(',')[3]}}"
# management_address: "{{item.split(',')[4]}}" # management_address: "{{item.split(',')[4]}}"
# cpu_cores: "{{item.split(',')[5]}}" # cpu_cores: "{{item.split(',')[5]}}"
# memory_MB: "{{item.split(',')[6]}}" # memory_MB: "{{item.split(',')[6]}}"
# disk_MB: "{{item.split(',')[7]}}" # disk_MB: "{{item.split(',')[7]}}"
os_ironic: os_ironic:
auth_plugin: None auth_plugin: None
auth: None auth: None
ironic_url: "{{ ironic_url }}" ironic_url: "{{ ironic_url }}"
driver: "agent_ipmitool" driver: "agent_ipmitool"
# UUID determination TBD for mass enrollment. # UUID determination TBD for mass enrollment.
uuid: "{{item.split(',')[9]}}" uuid: "{{item.split(',')[9]}}"
state: present state: present
nics: nics:
- mac: "{{item.split(',')[0]}}" - mac: "{{item.split(',')[0]}}"
properties: properties:
cpus: "{{item.split(',')[4]}}" cpus: "{{item.split(',')[4]}}"
cpu_arch: "x86_64" cpu_arch: "x86_64"
ram: "{{item.split(',')[5]}}" ram: "{{item.split(',')[5]}}"
disk_size: "{{item.split(',')[6]}}" disk_size: "{{item.split(',')[6]}}"
driver_info: driver_info:
power: power:
ipmi_address: "{{item.split(',')[3]}}" ipmi_address: "{{item.split(',')[3]}}"
ipmi_username: "{{item.split(',')[1]}}" ipmi_username: "{{item.split(',')[1]}}"
ipmi_password: "{{item.split(',')[2]}}" ipmi_password: "{{item.split(',')[2]}}"
deploy: deploy:
deploy_kernel: "{{ deploy_kernel_url }}" deploy_kernel: "{{ deploy_kernel_url }}"
deploy_ramdisk: "{{ deploy_ramdisk_url }}" deploy_ramdisk: "{{ deploy_ramdisk_url }}"
delegate_to: localhost delegate_to: localhost
with_lines: with_lines:
- cat {{ baremetal_csv_file }} - cat {{ baremetal_csv_file }}