step4: flatten nova service configuration

This change combines the previous puppet and docker files
into a single file that performs the docker service installation
and configuration.

Change-Id: I9bd5c9f007d9f69d7310cdd0106bcc923c1b0acd

deployment/nova/nova-api-container-puppet.yaml

@@ -167,7 +167,7 @@ resources:
       EnableInternalTLS: {get_param: EnableInternalTLS}
 
   NovaBase:
-    type: ../../puppet/services/nova-base.yaml
+    type: ./nova-base-puppet.yaml
     properties:
       ServiceData: {get_param: ServiceData}
       ServiceNetMap: {get_param: ServiceNetMap}

deployment/nova/nova-compute-container-puppet.yaml

@@ -278,7 +278,7 @@ resources:
       NovaServiceName: 'compute'
 
   NovaBase:
-    type: ../../puppet/services/nova-base.yaml
+    type: ./nova-base-puppet.yaml
     properties:
       ServiceData: {get_param: ServiceData}
       ServiceNetMap: {get_param: ServiceNetMap}

deployment/nova/nova-conductor-container-puppet.yaml

@@ -85,7 +85,7 @@ resources:
       NovaServiceName: 'conductor'
 
   NovaBase:
-    type: ../../puppet/services/nova-base.yaml
+    type: ./nova-base-puppet.yaml
     properties:
       ServiceData: {get_param: ServiceData}
       ServiceNetMap: {get_param: ServiceNetMap}

deployment/nova/nova-consoleauth-container-puppet.yaml

@@ -68,7 +68,7 @@ resources:
       NovaServiceName: 'consoleauth'
 
   NovaBase:
-    type: ../../puppet/services/nova-base.yaml
+    type: ./nova-base-puppet.yaml
     properties:
       ServiceData: {get_param: ServiceData}
       ServiceNetMap: {get_param: ServiceNetMap}

deployment/nova/nova-ironic-container-puppet.yaml

@@ -64,7 +64,7 @@ resources:
       RoleParameters: {get_param: RoleParameters}
 
   NovaBase:
-    type: ../../puppet/services/nova-base.yaml
+    type: ./nova-base-puppet.yaml
     properties:
       ServiceData: {get_param: ServiceData}
       ServiceNetMap: {get_param: ServiceNetMap}

deployment/nova/nova-libvirt-container-puppet.yaml

@@ -301,7 +301,7 @@ resources:
     type: OS::TripleO::Services::Logging::NovaLibvirt
 
   NovaBase:
-    type: ../../puppet/services/nova-base.yaml
+    type: ./nova-base-puppet.yaml
     properties:
       ServiceData: {get_param: ServiceData}
       ServiceNetMap: {get_param: ServiceNetMap}

deployment/nova/nova-metadata-container-puppet.yaml

@@ -97,7 +97,7 @@ resources:
       EnableInternalTLS: {get_param: EnableInternalTLS}
 
   NovaBase:
-    type: ../../puppet/services/nova-base.yaml
+    type: ./nova-base-puppet.yaml
     properties:
       ServiceData: {get_param: ServiceData}
       ServiceNetMap: {get_param: ServiceNetMap}

deployment/nova/nova-placement-container-puppet.yaml

@@ -92,7 +92,7 @@ resources:
       EnableInternalTLS: {get_param: EnableInternalTLS}
 
   NovaBase:
-    type: ../../puppet/services/nova-base.yaml
+    type: ./nova-base-puppet.yaml
     properties:
       ServiceData: {get_param: ServiceData}
       ServiceNetMap: {get_param: ServiceNetMap}

deployment/nova/nova-scheduler-container-puppet.yaml

@@ -98,7 +98,7 @@ resources:
       NovaServiceName: 'scheduler'
 
   NovaBase:
-    type: ../../puppet/services/nova-base.yaml
+    type: ./nova-base-puppet.yaml
     properties:
       ServiceData: {get_param: ServiceData}
       ServiceNetMap: {get_param: ServiceNetMap}

deployment/nova/nova-vnc-proxy-container-puppet.yaml

@@ -113,7 +113,7 @@ resources:
       NovaServiceName: 'vncproxy'
 
   NovaBase:
-    type: ../../puppet/services/nova-base.yaml
+    type: ./nova-base-puppet.yaml
     properties:
       ServiceData: {get_param: ServiceData}
       ServiceNetMap: {get_param: ServiceNetMap}

sample-env-generator/ssl.yaml

@@ -34,7 +34,7 @@ environments:
       puppet/all-nodes-config.yaml:
         parameters:
           - EnableInternalTLS
-      puppet/services/nova-base.yaml:
+      deployment/nova/nova-base-puppet.yaml:
         parameters:
           - RpcUseSSL
       deployment/rabbitmq/rabbitmq-messaging-notify-container-puppet.yaml: