diff --git a/ci/environments/scenario004-multinode-containers.yaml b/ci/environments/scenario004-multinode-containers.yaml index 8f3f61eee6..0e02554db3 100644 --- a/ci/environments/scenario004-multinode-containers.yaml +++ b/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 diff --git a/ci/environments/scenario004-standalone.yaml b/ci/environments/scenario004-standalone.yaml index 5d7b3ee7ba..2de031d6af 100644 --- a/ci/environments/scenario004-standalone.yaml +++ b/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 diff --git a/puppet/services/manila-backend-cephfs.yaml b/deployment/manila/manila-backend-cephfs.yaml similarity index 100% rename from puppet/services/manila-backend-cephfs.yaml rename to deployment/manila/manila-backend-cephfs.yaml diff --git a/puppet/services/manila-backend-isilon.yaml b/deployment/manila/manila-backend-isilon.yaml similarity index 100% rename from puppet/services/manila-backend-isilon.yaml rename to deployment/manila/manila-backend-isilon.yaml diff --git a/puppet/services/manila-backend-netapp.yaml b/deployment/manila/manila-backend-netapp.yaml similarity index 100% rename from puppet/services/manila-backend-netapp.yaml rename to deployment/manila/manila-backend-netapp.yaml diff --git a/puppet/services/manila-backend-unity.yaml b/deployment/manila/manila-backend-unity.yaml similarity index 100% rename from puppet/services/manila-backend-unity.yaml rename to deployment/manila/manila-backend-unity.yaml diff --git a/puppet/services/manila-backend-vmax.yaml b/deployment/manila/manila-backend-vmax.yaml similarity index 100% rename from puppet/services/manila-backend-vmax.yaml rename to deployment/manila/manila-backend-vmax.yaml diff --git a/puppet/services/manila-backend-vnx.yaml b/deployment/manila/manila-backend-vnx.yaml similarity index 100% rename from puppet/services/manila-backend-vnx.yaml rename to deployment/manila/manila-backend-vnx.yaml diff --git a/environments/manila-cephfsganesha-config.yaml b/environments/manila-cephfsganesha-config.yaml index a37217b433..74a3e27625 100644 --- a/environments/manila-cephfsganesha-config.yaml +++ b/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 diff --git a/environments/manila-cephfsnative-config.yaml b/environments/manila-cephfsnative-config.yaml index f3170a609c..05d6747921 100644 --- a/environments/manila-cephfsnative-config.yaml +++ b/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: diff --git a/environments/manila-isilon-config.yaml b/environments/manila-isilon-config.yaml index 4bfcf0a636..732c408e76 100644 --- a/environments/manila-isilon-config.yaml +++ b/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 diff --git a/environments/manila-netapp-config.yaml b/environments/manila-netapp-config.yaml index 4f46dda5f4..642fed5c5f 100644 --- a/environments/manila-netapp-config.yaml +++ b/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 diff --git a/environments/manila-unity-config.yaml b/environments/manila-unity-config.yaml index a8693d78eb..7ebb58f3f5 100644 --- a/environments/manila-unity-config.yaml +++ b/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 diff --git a/environments/manila-vmax-config.yaml b/environments/manila-vmax-config.yaml index 3c160241be..46c36903b8 100644 --- a/environments/manila-vmax-config.yaml +++ b/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 diff --git a/environments/manila-vnx-config.yaml b/environments/manila-vnx-config.yaml index 9e68688f80..ad5c3af656 100644 --- a/environments/manila-vnx-config.yaml +++ b/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