openstack/tripleo-heat-templates
Code Issues Proposed changes

Merge "Switch scenario004-containers to use ceph-ansible"

Browse Source
This commit is contained in:
Zuul 2017-10-28 05:54:04 +00:00 committed by Gerrit Code Review
commit 24c53c9b51
2 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ci/environments/scenario001-multinode-containers.yaml
View File

@ -107,20 +107,14 @@ parameter_defaults:
# This makes the job twice as fast # This makes the job twice as fast
ceilometer::agent::polling::polling_interval: 15 ceilometer::agent::polling::polling_interval: 15
Debug: true Debug: true
#NOTE(gfidente): not great but we need this to deploy on ext4
#http://docs.ceph.com/docs/jewel/rados/configuration/filesystem-recommendations/
CephAnsibleDisksConfig: CephAnsibleDisksConfig:
devices: devices:
- /dev/loop3 - /dev/loop3
journal_size: 512 journal_size: 512
osd_scenario: collocated osd_scenario: collocated
CephPoolDefaultPgNum: 32
CephPoolDefaultSize: 1
CephAnsibleExtraConfig: CephAnsibleExtraConfig:
ceph_conf_overrides:
global:
osd_pool_default_size: 1
osd_pool_default_pg_num: 32
osd_max_object_name_len: 256
osd_max_object_namespace_len: 64
centos_package_dependencies: [] centos_package_dependencies: []
CephAnsibleSkipTags: '' CephAnsibleSkipTags: ''
#NOTE: These ID's and keys should be regenerated for #NOTE: These ID's and keys should be regenerated for
@ -130,8 +124,6 @@ parameter_defaults:
CephMonKey: 'AQC+Ox1VmEr3BxAALZejqeHj50Nj6wJDvs96OQ==' CephMonKey: 'AQC+Ox1VmEr3BxAALZejqeHj50Nj6wJDvs96OQ=='
CephAdminKey: 'AQDLOh1VgEp6FRAAFzT7Zw+Y9V6JJExQAsRnRQ==' CephAdminKey: 'AQDLOh1VgEp6FRAAFzT7Zw+Y9V6JJExQAsRnRQ=='
CephClientKey: 'AQC+vYNXgDAgAhAAc8UoYt+OTz5uhV7ItLdwUw==' CephClientKey: 'AQC+vYNXgDAgAhAAc8UoYt+OTz5uhV7ItLdwUw=='
CephPoolDefaultSize: 1
DockerCephDaemonImage: ceph/daemon:tag-stable-3.0-jewel-centos-7
NovaEnableRbdBackend: true NovaEnableRbdBackend: true
CinderEnableRbdBackend: true CinderEnableRbdBackend: true
CinderBackupBackend: ceph CinderBackupBackend: ceph

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

@ -1,11 +1,11 @@
resource_registry: resource_registry:
OS::TripleO::Controller::Net::SoftwareConfig: ../common/net-config-multinode.yaml OS::TripleO::Controller::Net::SoftwareConfig: ../common/net-config-multinode.yaml
OS::TripleO::Compute::Net::SoftwareConfig: ../common/net-config-multinode.yaml OS::TripleO::Compute::Net::SoftwareConfig: ../common/net-config-multinode.yaml
# TODO deploy ceph with ceph-ansible: https://review.openstack.org/#/c/465066/ OS::TripleO::Services::CephMon: ../../docker/services/ceph-ansible/ceph-mon.yaml
OS::TripleO::Services::CephMds: ../../puppet/services/ceph-mds.yaml OS::TripleO::Services::CephOSD: ../../docker/services/ceph-ansible/ceph-osd.yaml
OS::TripleO::Services::CephMon: ../../puppet/services/ceph-mon.yaml OS::TripleO::Services::CephMds: ../../docker/services/ceph-ansible/ceph-mds.yaml
OS::TripleO::Services::CephOSD: ../../puppet/services/ceph-osd.yaml OS::TripleO::Services::CephRgw: ../../docker/services/ceph-ansible/ceph-rgw.yaml
OS::TripleO::Services::CephRgw: ../../puppet/services/ceph-rgw.yaml OS::TripleO::Services::CephClient: ../../docker/services/ceph-ansible/ceph-client.yaml
OS::TripleO::Services::SwiftProxy: OS::Heat::None OS::TripleO::Services::SwiftProxy: OS::Heat::None
OS::TripleO::Services::SwiftStorage: OS::Heat::None OS::TripleO::Services::SwiftStorage: OS::Heat::None
OS::TripleO::Services::SwiftRingBuilder: OS::Heat::None OS::TripleO::Services::SwiftRingBuilder: OS::Heat::None
@ -92,14 +92,17 @@ parameter_defaults:
nova::compute::libvirt::services::libvirt_virt_type: qemu nova::compute::libvirt::services::libvirt_virt_type: qemu
nova::compute::libvirt::libvirt_virt_type: qemu nova::compute::libvirt::libvirt_virt_type: qemu
Debug: true Debug: true
#NOTE(gfidente): not great but we need this to deploy on ext4 CephAnsibleDisksConfig:
#http://docs.ceph.com/docs/jewel/rados/configuration/filesystem-recommendations/ devices:
ExtraConfig: - /dev/loop3
ceph::profile::params::osd_max_object_name_len: 256 journal_size: 512
ceph::profile::params::osd_max_object_namespace_len: 64 journal_collocation: true
#NOTE(gfidente): necessary when deploying a single OSD osd_scenario: collocated
ceph::profile::params::osd_pool_default_pg_num: 32 CephPoolDefaultPgNum: 32
ceph::profile::params::osd_pool_default_pgp_num: 32 CephPoolDefaultSize: 1
CephAnsibleExtraConfig:
centos_package_dependencies: []
CephAnsibleSkipTags: ''
#NOTE: These ID's and keys should be regenerated for #NOTE: These ID's and keys should be regenerated for
# a production deployment. What is here is suitable for # a production deployment. What is here is suitable for
# developer and CI testing only. # developer and CI testing only.
@ -107,7 +110,12 @@ parameter_defaults:
CephMonKey: 'AQC+Ox1VmEr3BxAALZejqeHj50Nj6wJDvs96OQ==' CephMonKey: 'AQC+Ox1VmEr3BxAALZejqeHj50Nj6wJDvs96OQ=='
CephAdminKey: 'AQDLOh1VgEp6FRAAFzT7Zw+Y9V6JJExQAsRnRQ==' CephAdminKey: 'AQDLOh1VgEp6FRAAFzT7Zw+Y9V6JJExQAsRnRQ=='
CephClientKey: 'AQC+vYNXgDAgAhAAc8UoYt+OTz5uhV7ItLdwUw==' CephClientKey: 'AQC+vYNXgDAgAhAAc8UoYt+OTz5uhV7ItLdwUw=='
CephPoolDefaultSize: 1 NovaEnableRbdBackend: true
CinderEnableRbdBackend: true
CinderBackupBackend: ceph
GlanceBackend: rbd
GnocchiBackend: rbd
CinderEnableIscsiBackend: false
SwiftCeilometerPipelineEnabled: false SwiftCeilometerPipelineEnabled: false
# TODO: in Queens, re-add bgp-vpn and l2gw services when # TODO: in Queens, re-add bgp-vpn and l2gw services when
# containerized. # containerized.