openstack/tripleo-heat-templates
Code Issues Proposed changes

Move Manila backends into deployment

Browse Source 
Change-Id: I6d500a3d7a1d24c13649734bc99707c37e133c2b
Related-Blueprint: services-yaml-flattening
This commit is contained in:
Dan Prince 2019-04-15 09:38:38 -04:00
parent 3fc9ea118e
commit 4a9f2ac052
15 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ci/environments/scenario004-multinode-containers.yaml
View File

@ -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

2
ci/environments/scenario004-standalone.yaml
View File

@ -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

0
puppet/services/manila-backend-cephfs.yaml → deployment/manila/manila-backend-cephfs.yaml
View File

0
puppet/services/manila-backend-isilon.yaml → deployment/manila/manila-backend-isilon.yaml
View File

0
puppet/services/manila-backend-netapp.yaml → deployment/manila/manila-backend-netapp.yaml
View File

0
puppet/services/manila-backend-unity.yaml → deployment/manila/manila-backend-unity.yaml
View File

0
puppet/services/manila-backend-vmax.yaml → deployment/manila/manila-backend-vmax.yaml
View File

0
puppet/services/manila-backend-vnx.yaml → deployment/manila/manila-backend-vnx.yaml
View File

2
environments/manila-cephfsganesha-config.yaml
View File

@ -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

2
environments/manila-cephfsnative-config.yaml
View File

@ -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:

2
environments/manila-isilon-config.yaml
View File

@ -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

2
environments/manila-netapp-config.yaml
View File

@ -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

2
environments/manila-unity-config.yaml
View File

@ -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

2
environments/manila-vmax-config.yaml
View File

@ -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

2
environments/manila-vnx-config.yaml
View File

@ -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