Move Manila backends into deployment

Change-Id: I6d500a3d7a1d24c13649734bc99707c37e133c2b
Related-Blueprint: services-yaml-flattening

ci/environments/scenario004-multinode-containers.yaml

@@ -13,7 +13,7 @@ resource_registry:
   OS::TripleO::Services::ManilaApi: ../../deployment/manila/manila-api-container-puppet.yaml
   OS::TripleO::Services::ManilaScheduler: ../../deployment/manila/manila-scheduler-container-puppet.yaml
   OS::TripleO::Services::ManilaShare: ../../deployment/manila/manila-share-pacemaker-puppet.yaml
-  OS::TripleO::Services::ManilaBackendCephFs: ../../puppet/services/manila-backend-cephfs.yaml
+  OS::TripleO::Services::ManilaBackendCephFs: ../../deployment/manila/manila-backend-cephfs.yaml
   # TODO: in Queens, re-add bgp-vpn and l2gw services when
   # containerized.
   # https://bugs.launchpad.net/bugs/1713612

ci/environments/scenario004-standalone.yaml

@@ -16,7 +16,7 @@ resource_registry:
   OS::TripleO::Services::ManilaApi: ../../deployment/manila/manila-api-container-puppet.yaml
   OS::TripleO::Services::ManilaScheduler: ../../deployment/manila/manila-scheduler-container-puppet.yaml
   OS::TripleO::Services::ManilaShare: ../../deployment/manila/manila-share-pacemaker-puppet.yaml
-  OS::TripleO::Services::ManilaBackendCephFs: ../../puppet/services/manila-backend-cephfs.yaml
+  OS::TripleO::Services::ManilaBackendCephFs: ../../deployment/manila/manila-backend-cephfs.yaml
   OS::TripleO::Services::OsloMessagingRpc: ../../deployment/rabbitmq/rabbitmq-messaging-rpc-pacemaker-puppet.yaml
   OS::TripleO::Services::OsloMessagingNotify: ../../deployment/rabbitmq/rabbitmq-messaging-notify-shared-puppet.yaml
   OS::TripleO::Services::HAproxy: ../../deployment/haproxy/haproxy-pacemaker-puppet.yaml

environments/manila-cephfsganesha-config.yaml

@@ -5,7 +5,7 @@ resource_registry:
   OS::TripleO::Services::ManilaScheduler: ../deployment/manila/manila-scheduler-container-puppet.yaml
   # Only manila-share is pacemaker managed:
   OS::TripleO::Services::ManilaShare: ../deployment/manila/manila-share-pacemaker-puppet.yaml
-  OS::TripleO::Services::ManilaBackendCephFs: ../puppet/services/manila-backend-cephfs.yaml
+  OS::TripleO::Services::ManilaBackendCephFs: ../deployment/manila/manila-backend-cephfs.yaml
   # ceph-nfs (ganesha) service is installed and configured by ceph-ansible
   # but it's still managed by pacemaker
   OS::TripleO::Services::CephNfs: ../deployment/ceph-ansible/ceph-nfs.yaml

environments/manila-cephfsnative-config.yaml

@@ -5,7 +5,7 @@ resource_registry:
   OS::TripleO::Services::ManilaScheduler: ../deployment/manila/manila-scheduler-container-puppet.yaml
   # Only manila-share is pacemaker managed:
   OS::TripleO::Services::ManilaShare: ../deployment/manila/manila-share-pacemaker-puppet.yaml
-  OS::TripleO::Services::ManilaBackendCephFs: ../puppet/services/manila-backend-cephfs.yaml
+  OS::TripleO::Services::ManilaBackendCephFs: ../deployment/manila/manila-backend-cephfs.yaml
 
 
 parameter_defaults:

environments/manila-isilon-config.yaml

@@ -4,7 +4,7 @@ resource_registry:
   OS::TripleO::Services::ManilaScheduler: ../deployment/manila/manila-scheduler-container-puppet.yaml
   # Only manila-share is pacemaker managed:
   OS::TripleO::Services::ManilaShare: ../deployment/manila/manila-share-pacemaker-puppet.yaml
-  OS::TripleO::Services::ManilaBackendIsilon: ../puppet/services/manila-backend-isilon.yaml
+  OS::TripleO::Services::ManilaBackendIsilon: ../deployment/manila/manila-backend-isilon.yaml
 
 parameter_defaults:
   ManilaIsilonBackendName: tripleo_isilon

environments/manila-netapp-config.yaml

@@ -4,7 +4,7 @@ resource_registry:
   OS::TripleO::Services::ManilaScheduler: ../deployment/manila/manila-scheduler-container-puppet.yam
   # Only manila-share is pacemaker managed:
   OS::TripleO::Services::ManilaShare: ../docker/deployment/manila/manila-share-pacemaker-puppet.yaml
-  OS::TripleO::Services::ManilaBackendNetapp: ../puppet/services/manila-backend-netapp.yaml
+  OS::TripleO::Services::ManilaBackendNetapp: ../deployment/manila/manila-backend-netapp.yaml
 
 parameter_defaults:
   ManilaNetappBackendName: tripleo_netapp

environments/manila-unity-config.yaml

@@ -4,7 +4,7 @@ resource_registry:
   OS::TripleO::Services::ManilaScheduler: ../deployment/manila/manila-scheduler-container-puppet.yaml
   # Only manila-share is pacemaker managed:
   OS::TripleO::Services::ManilaShare: ../deployment/manila/manila-share-pacemaker-puppet.yaml
-  OS::TripleO::Services::ManilaBackendUnity: ../puppet/services/manila-backend-unity.yaml
+  OS::TripleO::Services::ManilaBackendUnity: ../deployment/manila/manila-backend-unity.yaml
 
 parameter_defaults:
   ManilaUnityBackendName: tripleo_manila_unity

environments/manila-vmax-config.yaml

@@ -4,7 +4,7 @@ resource_registry:
   OS::TripleO::Services::ManilaScheduler: ../deployment/manila/manila-scheduler-container-puppet.yaml
   # Only manila-share is pacemaker managed:
   OS::TripleO::Services::ManilaShare: ../deployment/manila/manila-share-pacemaker-puppet.yaml
-  OS::TripleO::Services::ManilaBackendVMAX: ../puppet/services/manila-backend-vmax.yaml
+  OS::TripleO::Services::ManilaBackendVMAX: ../deployment/manila/manila-backend-vmax.yaml
 
 parameter_defaults:
   ManilaVMAXBackendName: tripleo_manila_vmax

environments/manila-vnx-config.yaml

@@ -4,7 +4,7 @@ resource_registry:
   OS::TripleO::Services::ManilaScheduler: ../deployment/manila/manila-scheduler-container-puppet.yaml
   # Only manila-share is pacemaker managed:
   OS::TripleO::Services::ManilaShare: ../deployment/manila/manila-share-pacemaker-puppet.yaml
-  OS::TripleO::Services::ManilaBackendVNX: ../puppet/services/manila-backend-vnx.yaml
+  OS::TripleO::Services::ManilaBackendVNX: ../deployment/manila/manila-backend-vnx.yaml
 
 parameter_defaults:
   ManilaVNXBackendName: tripleo_manila_vnx