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

This reverts commit c8e6d4f05b16d2e589b0d4b5f36b8cc5bf85179f.