Julia Kreger 5ba137cee5 Merge branch 'master' of https://github.com/juliakreger/ironic-poc into cleanup ...

Merged changes by hand due to the changes made in the cleanup branch.

Conflicts:
	enroll/virtual_enroll.yaml
	install/roles/install_standalone_ironic_localhost/tasks/main.yml

2015-03-16 13:12:31 -04:00

..

create_bootable_image.yml

Removal of local_action

2015-03-13 10:41:52 -04:00

create_dib_image.yml

Add license headers to ironic-install role

2015-03-13 10:34:12 -04:00

dib_install.yml

Removal of local_action

2015-03-13 10:41:52 -04:00

main.yml

Merge branch 'master' of https://github.com/juliakreger/ironic-poc into cleanup

2015-03-16 13:12:31 -04:00