Try without the require_in now that the comment block is gone.
require_in actually /is/ required for cmd.run to work (before apt-get install).
Only add key if it doesn't already exist (aren't we smart?).
Merge branch 'master' of github.com:circatree/salt-hosting-states

Conflicts:
	mariadb/init.sls