Revert "Revert "Merge branch 'master' of github.com:cloudware-cookbooks/ktc-nova""

This reverts commit 4440f3c475e0c1f2fac1234e787ab198ddd9e93d.