Replace IP + keys with config macros

Change-Id: I4dfbf7a3f6981ab3cdad5e8436994aa87be93518
Merge pull request #2 from ccarpita/new/template-vars

Replace IP + keys with config macros