Merge "Move nova::db data within service template"

diff --cc puppet/controller.yaml
Simple merge

diff --cc puppet/services/nova-api.yaml
Simple merge

diff --cc puppet/services/nova-base.yaml
Simple merge

diff --cc puppet/services/nova-compute.yaml
Simple merge

diff --cc puppet/services/nova-conductor.yaml
Simple merge

diff --cc puppet/services/nova-consoleauth.yaml
Simple merge

diff --cc puppet/services/nova-libvirt.yaml
Simple merge

diff --cc puppet/services/nova-scheduler.yaml
Simple merge

diff --cc puppet/services/nova-vncproxy.yaml
Simple merge