Split the config out into two files

Rather than having embedded config in the yaml file, put the config as
something that probably wants puppet-like variable interpolation, and
leave the yaml file as a direct list of yaml.

Change-Id: I099ff1b28f66906cfa3e668c160a9ab999f8914f
Merge "Split the config out into two files"