scenario010: enable Ceph RBD
Enabling Ceph on scenario010 allow us to test conversion of amphora image format from QCOW2 to RAW in octavia-undercloud role in tripleo-common. This patch also removes NeutronServicePlugins from being set (in line with I3da329db28701c7e9798083982953c5c9c861c50) and unchecks Octavia from scenario003 in the service testing matrix set previously by mistake. Partial-Bug: #1778303 Related-Bug: #1722758 Change-Id: I717301dc0777ecd2118253a86cd1f8353539482f
This commit is contained in:
parent
b7e124bad9
commit
a33d42abb6
@ -72,7 +72,7 @@ and should be executed according to the following table:
|
||||
+----------------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+
|
||||
| keystone | X | X | X | X | X | X | X | | X | X | X |
|
||||
+----------------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+
|
||||
| glance | | rbd | swift | file | rgw | file | file | | file | file | file |
|
||||
| glance | | rbd | swift | file | rgw | file | file | | rbd | file | file |
|
||||
+----------------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+
|
||||
| cinder | | rbd | iscsi | | | | | | | | |
|
||||
+----------------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+
|
||||
@ -150,5 +150,5 @@ and should be executed according to the following table:
|
||||
+----------------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+
|
||||
| designate | | | | X | | | | | | | |
|
||||
+----------------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+
|
||||
| octavia | | | | X | | | | | X | | |
|
||||
| octavia | | | | | | | | | X | | |
|
||||
+----------------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+
|
||||
|
@ -1,6 +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::HAproxy: ../../docker/services/pacemaker/haproxy.yaml
|
||||
OS::TripleO::Services::Pacemaker: ../../puppet/services/pacemaker.yaml
|
||||
OS::TripleO::Services::PacemakerRemote: ../../puppet/services/pacemaker_remote.yaml
|
||||
@ -16,6 +20,16 @@ resource_registry:
|
||||
OS::TripleO::Services::OctaviaHealthManager: ../../docker/services/octavia-health-manager.yaml
|
||||
OS::TripleO::Services::OctaviaWorker: ../../docker/services/octavia-worker.yaml
|
||||
OS::TripleO::Services::OctaviaDeploymentConfig: ../../docker/services/octavia/octavia-deployment-config.yaml
|
||||
OS::TripleO::Services::CinderApi: OS::Heat::None
|
||||
OS::TripleO::Services::CinderBackup: OS::Heat::None
|
||||
OS::TripleO::Services::CinderScheduler: OS::Heat::None
|
||||
OS::TripleO::Services::CinderVolume: OS::Heat::None
|
||||
OS::TripleO::Services::SwiftProxy: OS::Heat::None
|
||||
OS::TripleO::Services::SwiftDispersion: OS::Heat::None
|
||||
OS::TripleO::Services::SwiftRingBuilder: OS::Heat::None
|
||||
OS::TripleO::Services::SwiftStorage: OS::Heat::None
|
||||
OS::TripleO::Services::SwiftRingBuilder: OS::Heat::None
|
||||
OS::TripleO::Services::SwiftStorage: OS::Heat::None
|
||||
|
||||
parameter_defaults:
|
||||
ControllerServices:
|
||||
@ -59,16 +73,45 @@ parameter_defaults:
|
||||
- OS::TripleO::Services::TripleoPackages
|
||||
- OS::TripleO::Services::TripleoFirewall
|
||||
- OS::TripleO::Services::Sshd
|
||||
- OS::TripleO::Services::CephMgr
|
||||
- OS::TripleO::Services::CephMon
|
||||
- OS::TripleO::Services::CephOSD
|
||||
- OS::TripleO::Services::CephClient
|
||||
- OS::TripleO::Services::Iscsid
|
||||
ControllerExtraConfig:
|
||||
nova::compute::libvirt::services::libvirt_virt_type: qemu
|
||||
nova::compute::libvirt::libvirt_virt_type: qemu
|
||||
Debug: true
|
||||
CephAnsibleDisksConfig:
|
||||
devices:
|
||||
- /dev/loop3
|
||||
journal_size: 512
|
||||
osd_scenario: collocated
|
||||
CephPoolDefaultPgNum: 32
|
||||
CephPoolDefaultSize: 1
|
||||
CephPools:
|
||||
- name: altrbd
|
||||
pg_num: 8
|
||||
rule_name: replicated_rule
|
||||
CephAnsibleExtraConfig:
|
||||
centos_package_dependencies: []
|
||||
ceph_osd_docker_memory_limit: '1g'
|
||||
ceph_mds_docker_memory_limit: '1g'
|
||||
CephAnsibleSkipTags: ''
|
||||
#NOTE: These ID's and keys should be regenerated for
|
||||
# a production deployment. What is here is suitable for
|
||||
# developer and CI testing only.
|
||||
CephClusterFSID: '4b5c8c0a-ff60-454b-a1b4-9747aa737d19'
|
||||
CephClusterName: mycephcluster
|
||||
CephMonKey: 'AQC+Ox1VmEr3BxAALZejqeHj50Nj6wJDvs96OQ=='
|
||||
CephAdminKey: 'AQDLOh1VgEp6FRAAFzT7Zw+Y9V6JJExQAsRnRQ=='
|
||||
CephClientKey: 'AQC+vYNXgDAgAhAAc8UoYt+OTz5uhV7ItLdwUw=='
|
||||
NovaEnableRbdBackend: true
|
||||
GlanceBackend: rbd
|
||||
GnocchiRbdPoolName: metrics
|
||||
SwiftCeilometerPipelineEnabled: false
|
||||
NeutronServicePlugins: "qos,router,trunk"
|
||||
NeutronEnableForceMetadata: true
|
||||
OctaviaManageNovaFlavor: true
|
||||
# For now, we hardcode it but soon it'll be generated in tripleo-common
|
||||
OctaviaCaKeyPassphrase: 'upstreamci'
|
||||
OctaviaGenerateCerts: true
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user