Typo in /compute/ironic manifest
Merge branch 'master' of https://github.com/rthallisey/puppet-nova

Conflicts:
	manifests/compute/ironic.pp