Browse Source

move ceph-ansible into deployment

Change-Id: I67dc1c2dd7d1e0308db660577f25d74a6305dae6
Related-Blueprint: services-yaml-flattening
changes/35/644635/2
Dan Prince 2 years ago
committed by Emilien Macchi
parent
commit
5c8456c5cd
  1. 8
      ci/environments/scenario001-multinode-containers.yaml
  2. 8
      ci/environments/scenario001-standalone.yaml
  3. 12
      ci/environments/scenario004-multinode-containers.yaml
  4. 12
      ci/environments/scenario004-standalone.yaml
  5. 8
      ci/environments/scenario010-multinode-containers.yaml
  6. 0
      deployment/ceph-ansible/ceph-base.yaml
  7. 0
      deployment/ceph-ansible/ceph-client.yaml
  8. 0
      deployment/ceph-ansible/ceph-external.yaml
  9. 0
      deployment/ceph-ansible/ceph-mds.yaml
  10. 0
      deployment/ceph-ansible/ceph-mgr.yaml
  11. 0
      deployment/ceph-ansible/ceph-mon.yaml
  12. 0
      deployment/ceph-ansible/ceph-nfs.yaml
  13. 0
      deployment/ceph-ansible/ceph-osd.yaml
  14. 0
      deployment/ceph-ansible/ceph-rbdmirror.yaml
  15. 0
      deployment/ceph-ansible/ceph-rgw.yaml
  16. 2
      environments/ceph-ansible/ceph-ansible-external.yaml
  17. 8
      environments/ceph-ansible/ceph-ansible.yaml
  18. 2
      environments/ceph-ansible/ceph-mds.yaml
  19. 2
      environments/ceph-ansible/ceph-rbdmirror.yaml
  20. 2
      environments/ceph-ansible/ceph-rgw.yaml
  21. 2
      environments/manila-cephfsganesha-config.yaml
  22. 2
      environments/storage-environment-external.yaml
  23. 8
      environments/storage-environment.yaml
  24. 20
      tools/yaml-validate.py
  25. 2
      zuul.d/layout.yaml

8
ci/environments/scenario001-multinode-containers.yaml

@ -1,10 +1,10 @@
resource_registry:
OS::TripleO::Controller::Net::SoftwareConfig: ../common/net-config-multinode.yaml
OS::TripleO::Compute::Net::SoftwareConfig: ../common/net-config-multinode.yaml
OS::TripleO::Services::CephMgr: ../../docker/services/ceph-ansible/ceph-mgr.yaml
OS::TripleO::Services::CephMon: ../../docker/services/ceph-ansible/ceph-mon.yaml
OS::TripleO::Services::CephOSD: ../../docker/services/ceph-ansible/ceph-osd.yaml
OS::TripleO::Services::CephClient: ../../docker/services/ceph-ansible/ceph-client.yaml
OS::TripleO::Services::CephMgr: ../../deployment/ceph-ansible/ceph-mgr.yaml
OS::TripleO::Services::CephMon: ../../deployment/ceph-ansible/ceph-mon.yaml
OS::TripleO::Services::CephOSD: ../../deployment/ceph-ansible/ceph-osd.yaml
OS::TripleO::Services::CephClient: ../../deployment/ceph-ansible/ceph-client.yaml
OS::TripleO::Services::PankoApi: ../../deployment/panko/panko-api-container-puppet.yaml
OS::TripleO::Services::Collectd: ../../deployment/metrics/collectd-container-puppet.yaml
OS::TripleO::Services::MetricsQdr: ../../deployment/metrics/qdr-container-puppet.yaml

8
ci/environments/scenario001-standalone.yaml

@ -6,10 +6,10 @@ resource_registry:
OS::TripleO::Services::CeilometerAgentCentral: ../../deployment/ceilometer/ceilometer-agent-central-container-puppet.yaml
OS::TripleO::Services::CeilometerAgentNotification: ../../deployment/ceilometer/ceilometer-agent-notification-container-puppet.yaml
OS::TripleO::Services::ComputeCeilometerAgent: ../../deployment/ceilometer/ceilometer-agent-compute-container-puppet.yaml
OS::TripleO::Services::CephMgr: ../../docker/services/ceph-ansible/ceph-mgr.yaml
OS::TripleO::Services::CephMon: ../../docker/services/ceph-ansible/ceph-mon.yaml
OS::TripleO::Services::CephOSD: ../../docker/services/ceph-ansible/ceph-osd.yaml
OS::TripleO::Services::CephClient: ../../docker/services/ceph-ansible/ceph-client.yaml
OS::TripleO::Services::CephMgr: ../../deployment/ceph-ansible/ceph-mgr.yaml
OS::TripleO::Services::CephMon: ../../deployment/ceph-ansible/ceph-mon.yaml
OS::TripleO::Services::CephOSD: ../../deployment/ceph-ansible/ceph-osd.yaml
OS::TripleO::Services::CephClient: ../../deployment/ceph-ansible/ceph-client.yaml
OS::TripleO::Services::PankoApi: ../../deployment/deprecated/panko/panko-api-container-puppet.yaml
OS::TripleO::Services::Collectd: ../../deployment/metrics/collectd-container-puppet.yaml
OS::TripleO::Services::GnocchiApi: ../../deployment/gnocchi/gnocchi-api-container-puppet.yaml

12
ci/environments/scenario004-multinode-containers.yaml

@ -1,12 +1,12 @@
resource_registry:
OS::TripleO::Controller::Net::SoftwareConfig: ../common/net-config-multinode.yaml
OS::TripleO::Compute::Net::SoftwareConfig: ../common/net-config-multinode.yaml
OS::TripleO::Services::CephMgr: ../../docker/services/ceph-ansible/ceph-mgr.yaml
OS::TripleO::Services::CephMon: ../../docker/services/ceph-ansible/ceph-mon.yaml
OS::TripleO::Services::CephOSD: ../../docker/services/ceph-ansible/ceph-osd.yaml
OS::TripleO::Services::CephMds: ../../docker/services/ceph-ansible/ceph-mds.yaml
OS::TripleO::Services::CephRgw: ../../docker/services/ceph-ansible/ceph-rgw.yaml
OS::TripleO::Services::CephClient: ../../docker/services/ceph-ansible/ceph-client.yaml
OS::TripleO::Services::CephMgr: ../../deployment/ceph-ansible/ceph-mgr.yaml
OS::TripleO::Services::CephMon: ../../deployment/ceph-ansible/ceph-mon.yaml
OS::TripleO::Services::CephOSD: ../../deployment/ceph-ansible/ceph-osd.yaml
OS::TripleO::Services::CephMds: ../../deployment/ceph-ansible/ceph-mds.yaml
OS::TripleO::Services::CephRgw: ../../deployment/ceph-ansible/ceph-rgw.yaml
OS::TripleO::Services::CephClient: ../../deployment/ceph-ansible/ceph-client.yaml
OS::TripleO::Services::SwiftProxy: OS::Heat::None
OS::TripleO::Services::SwiftStorage: OS::Heat::None
OS::TripleO::Services::SwiftRingBuilder: OS::Heat::None

12
ci/environments/scenario004-standalone.yaml

@ -4,12 +4,12 @@ resource_registry:
OS::TripleO::Services::CinderVolume: OS::Heat::None
OS::TripleO::Services::Redis: OS::Heat::None
OS::TripleO::Services::Horizon: OS::Heat::None
OS::TripleO::Services::CephMgr: ../../docker/services/ceph-ansible/ceph-mgr.yaml
OS::TripleO::Services::CephMon: ../../docker/services/ceph-ansible/ceph-mon.yaml
OS::TripleO::Services::CephOSD: ../../docker/services/ceph-ansible/ceph-osd.yaml
OS::TripleO::Services::CephMds: ../../docker/services/ceph-ansible/ceph-mds.yaml
OS::TripleO::Services::CephRgw: ../../docker/services/ceph-ansible/ceph-rgw.yaml
OS::TripleO::Services::CephClient: ../../docker/services/ceph-ansible/ceph-client.yaml
OS::TripleO::Services::CephMgr: ../../deployment/ceph-ansible/ceph-mgr.yaml
OS::TripleO::Services::CephMon: ../../deployment/ceph-ansible/ceph-mon.yaml
OS::TripleO::Services::CephOSD: ../../deployment/ceph-ansible/ceph-osd.yaml
OS::TripleO::Services::CephMds: ../../deployment/ceph-ansible/ceph-mds.yaml
OS::TripleO::Services::CephRgw: ../../deployment/ceph-ansible/ceph-rgw.yaml
OS::TripleO::Services::CephClient: ../../deployment/ceph-ansible/ceph-client.yaml
OS::TripleO::Services::SwiftProxy: OS::Heat::None
OS::TripleO::Services::SwiftStorage: OS::Heat::None
OS::TripleO::Services::SwiftRingBuilder: OS::Heat::None

8
ci/environments/scenario010-multinode-containers.yaml

@ -1,10 +1,10 @@
resource_registry:
OS::TripleO::Controller::Net::SoftwareConfig: ../common/net-config-multinode.yaml
OS::TripleO::Compute::Net::SoftwareConfig: ../common/net-config-multinode.yaml
OS::TripleO::Services::CephMgr: ../../docker/services/ceph-ansible/ceph-mgr.yaml
OS::TripleO::Services::CephMon: ../../docker/services/ceph-ansible/ceph-mon.yaml
OS::TripleO::Services::CephOSD: ../../docker/services/ceph-ansible/ceph-osd.yaml
OS::TripleO::Services::CephClient: ../../docker/services/ceph-ansible/ceph-client.yaml
OS::TripleO::Services::CephMgr: ../../deployment/ceph-ansible/ceph-mgr.yaml
OS::TripleO::Services::CephMon: ../../deployment/ceph-ansible/ceph-mon.yaml
OS::TripleO::Services::CephOSD: ../../deployment/ceph-ansible/ceph-osd.yaml
OS::TripleO::Services::CephClient: ../../deployment/ceph-ansible/ceph-client.yaml
OS::TripleO::Services::HAproxy: ../../deployment/haproxy/haproxy-pacemaker-puppet.yaml
OS::TripleO::Services::Pacemaker: ../../puppet/services/pacemaker.yaml
OS::TripleO::Services::PacemakerRemote: ../../puppet/services/pacemaker_remote.yaml

0
docker/services/ceph-ansible/ceph-base.yaml → deployment/ceph-ansible/ceph-base.yaml

0
docker/services/ceph-ansible/ceph-client.yaml → deployment/ceph-ansible/ceph-client.yaml

0
docker/services/ceph-ansible/ceph-external.yaml → deployment/ceph-ansible/ceph-external.yaml

0
docker/services/ceph-ansible/ceph-mds.yaml → deployment/ceph-ansible/ceph-mds.yaml

0
docker/services/ceph-ansible/ceph-mgr.yaml → deployment/ceph-ansible/ceph-mgr.yaml

0
docker/services/ceph-ansible/ceph-mon.yaml → deployment/ceph-ansible/ceph-mon.yaml

0
docker/services/ceph-ansible/ceph-nfs.yaml → deployment/ceph-ansible/ceph-nfs.yaml

0
docker/services/ceph-ansible/ceph-osd.yaml → deployment/ceph-ansible/ceph-osd.yaml

0
docker/services/ceph-ansible/ceph-rbdmirror.yaml → deployment/ceph-ansible/ceph-rbdmirror.yaml

0
docker/services/ceph-ansible/ceph-rgw.yaml → deployment/ceph-ansible/ceph-rgw.yaml

2
environments/ceph-ansible/ceph-ansible-external.yaml

@ -1,5 +1,5 @@
resource_registry:
OS::TripleO::Services::CephExternal: ../../docker/services/ceph-ansible/ceph-external.yaml
OS::TripleO::Services::CephExternal: ../../deployment/ceph-ansible/ceph-external.yaml
parameter_defaults:
# NOTE: These example parameters are required when using CephExternal

8
environments/ceph-ansible/ceph-ansible.yaml

@ -1,8 +1,8 @@
resource_registry:
OS::TripleO::Services::CephMgr: ../../docker/services/ceph-ansible/ceph-mgr.yaml
OS::TripleO::Services::CephMon: ../../docker/services/ceph-ansible/ceph-mon.yaml
OS::TripleO::Services::CephOSD: ../../docker/services/ceph-ansible/ceph-osd.yaml
OS::TripleO::Services::CephClient: ../../docker/services/ceph-ansible/ceph-client.yaml
OS::TripleO::Services::CephMgr: ../../deployment/ceph-ansible/ceph-mgr.yaml
OS::TripleO::Services::CephMon: ../../deployment/ceph-ansible/ceph-mon.yaml
OS::TripleO::Services::CephOSD: ../../deployment/ceph-ansible/ceph-osd.yaml
OS::TripleO::Services::CephClient: ../../deployment/ceph-ansible/ceph-client.yaml
parameter_defaults:
# Ensure that if user overrides CephAnsiblePlaybook via some env

2
environments/ceph-ansible/ceph-mds.yaml

@ -1,2 +1,2 @@
resource_registry:
OS::TripleO::Services::CephMds: ../../docker/services/ceph-ansible/ceph-mds.yaml
OS::TripleO::Services::CephMds: ../../deployment/ceph-ansible/ceph-mds.yaml

2
environments/ceph-ansible/ceph-rbdmirror.yaml

@ -1,2 +1,2 @@
resource_registry:
OS::TripleO::Services::CephRbdMirror: ../../docker/services/ceph-ansible/ceph-rbdmirror.yaml
OS::TripleO::Services::CephRbdMirror: ../../deployment/ceph-ansible/ceph-rbdmirror.yaml

2
environments/ceph-ansible/ceph-rgw.yaml

@ -1,5 +1,5 @@
resource_registry:
OS::TripleO::Services::CephRgw: ../../docker/services/ceph-ansible/ceph-rgw.yaml
OS::TripleO::Services::CephRgw: ../../deployment/ceph-ansible/ceph-rgw.yaml
OS::TripleO::Services::SwiftProxy: OS::Heat::None
OS::TripleO::Services::SwiftStorage: OS::Heat::None
OS::TripleO::Services::SwiftRingBuilder: OS::Heat::None

2
environments/manila-cephfsganesha-config.yaml

@ -8,7 +8,7 @@ resource_registry:
OS::TripleO::Services::ManilaBackendCephFs: ../puppet/services/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: ../docker/services/ceph-ansible/ceph-nfs.yaml
OS::TripleO::Services::CephNfs: ../deployment/ceph-ansible/ceph-nfs.yaml
parameter_defaults:

2
environments/storage-environment-external.yaml

@ -4,7 +4,7 @@
# A Heat environment file which can be used to enable the
# use of an externally managed Ceph cluster.
resource_registry:
OS::TripleO::Services::CephExternal: ../docker/services/ceph-ansible/ceph-external.yaml
OS::TripleO::Services::CephExternal: ../deployment/ceph-ansible/ceph-external.yaml
OS::TripleO::Services::CephMon: OS::Heat::None
OS::TripleO::Services::CephClient: OS::Heat::None
OS::TripleO::Services::CephOSD: OS::Heat::None

8
environments/storage-environment.yaml

@ -6,10 +6,10 @@
## backends. Defaults to Ceph used as a backend for Cinder, Glance and
## Nova ephemeral storage.
resource_registry:
OS::TripleO::Services::CephMgr: ../docker/services/ceph-ansible/ceph-mgr.yaml
OS::TripleO::Services::CephMon: ../docker/services/ceph-ansible/ceph-mon.yaml
OS::TripleO::Services::CephOSD: ../docker/services/ceph-ansible/ceph-osd.yaml
OS::TripleO::Services::CephClient: ../docker/services/ceph-ansible/ceph-client.yaml
OS::TripleO::Services::CephMgr: ../deployment/ceph-ansible/ceph-mgr.yaml
OS::TripleO::Services::CephMon: ../deployment/ceph-ansible/ceph-mon.yaml
OS::TripleO::Services::CephOSD: ../deployment/ceph-ansible/ceph-osd.yaml
OS::TripleO::Services::CephClient: ../deployment/ceph-ansible/ceph-client.yaml
parameter_defaults:
#### BACKEND SELECTION ####

20
tools/yaml-validate.py

@ -260,15 +260,15 @@ CONFIG_RESOURCE_TYPES = [
WORKFLOW_TASKS_EXCLUSIONS = [
'./deployment/octavia/octavia-deployment-config.yaml',
'./docker/services/ceph-ansible/ceph-external.yaml',
'./docker/services/ceph-ansible/ceph-osd.yaml',
'./docker/services/ceph-ansible/ceph-rbdmirror.yaml',
'./docker/services/ceph-ansible/ceph-client.yaml',
'./docker/services/ceph-ansible/ceph-mds.yaml',
'./docker/services/ceph-ansible/ceph-rgw.yaml',
'./docker/services/ceph-ansible/ceph-base.yaml',
'./docker/services/ceph-ansible/ceph-mon.yaml',
'./docker/services/ceph-ansible/ceph-mgr.yaml',
'./deployment/ceph-ansible/ceph-external.yaml',
'./deployment/ceph-ansible/ceph-osd.yaml',
'./deployment/ceph-ansible/ceph-rbdmirror.yaml',
'./deployment/ceph-ansible/ceph-client.yaml',
'./deployment/ceph-ansible/ceph-mds.yaml',
'./deployment/ceph-ansible/ceph-rgw.yaml',
'./deployment/ceph-ansible/ceph-base.yaml',
'./deployment/ceph-ansible/ceph-mon.yaml',
'./deployment/ceph-ansible/ceph-mgr.yaml',
'./docker/services/skydive/skydive-base.yaml',
'./docker/services/skydive/skydive-agent.yaml',
'./docker/services/skydive/skydive-analyzer.yaml',
@ -602,7 +602,7 @@ def validate_docker_service(filename, tpl):
for section_name in REQUIRED_DOCKER_SECTIONS:
if section_name not in role_data:
# add an exception if both step_config is used in docker
# service, docker/services/ceph-ansible/ceph-nfs.yaml uses
# service, deployment/ceph-ansible/ceph-nfs.yaml uses
# additional step_config to add pacemaker resources
if (section_name == 'docker_config' and
role_data.get('step_config', '')):

2
zuul.d/layout.yaml

@ -92,7 +92,7 @@
dependencies: *deps_unit_lint
files:
- ^(docker|puppet)/services/.*octavia.*$
- ^docker/services/ceph-ansible.*$
- ^deployment/ceph-ansible.*$
- ci/environments/scenario010-multinode-containers.yaml
- ^environments\/.*.yaml
- ^deployed-server/.*$

Loading…
Cancel
Save