openstack/tripleo-heat-templates
Code Issues Proposed changes

Merge "Cinder volume service is not managed by Pacemaker on BlockStorage"

Browse Source
This commit is contained in:
Jenkins 2016-10-03 16:40:41 +00:00 committed by Gerrit Code Review
commit 85fff5d679
4 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
overcloud-resource-registry-puppet.j2.yaml
View File

@ -99,6 +99,7 @@ resource_registry:
OS::TripleO::Services::CinderBackup: OS::Heat::None OS::TripleO::Services::CinderBackup: OS::Heat::None
OS::TripleO::Services::CinderScheduler: puppet/services/cinder-scheduler.yaml OS::TripleO::Services::CinderScheduler: puppet/services/cinder-scheduler.yaml
OS::TripleO::Services::CinderVolume: puppet/services/cinder-volume.yaml OS::TripleO::Services::CinderVolume: puppet/services/cinder-volume.yaml
OS::TripleO::Services::BlockStorageCinderVolume: puppet/services/cinder-volume.yaml
OS::TripleO::Services::Core: OS::Heat::None OS::TripleO::Services::Core: OS::Heat::None
OS::TripleO::Services::Keystone: puppet/services/keystone.yaml OS::TripleO::Services::Keystone: puppet/services/keystone.yaml
OS::TripleO::Services::GlanceApi: puppet/services/glance-api.yaml OS::TripleO::Services::GlanceApi: puppet/services/glance-api.yaml

1
puppet/services/cinder-base.yaml
View File

@ -66,7 +66,6 @@ outputs:
cinder::rabbit_password: {get_param: RabbitPassword} cinder::rabbit_password: {get_param: RabbitPassword}
cinder::rabbit_port: {get_param: RabbitClientPort} cinder::rabbit_port: {get_param: RabbitClientPort}
cinder::rabbit_heartbeat_timeout_threshold: 60 cinder::rabbit_heartbeat_timeout_threshold: 60
cinder::host: hostgroup
cinder::cron::db_purge::destination: '/dev/null' cinder::cron::db_purge::destination: '/dev/null'
cinder::db::database_db_max_retries: -1 cinder::db::database_db_max_retries: -1
cinder::db::database_max_retries: -1 cinder::db::database_max_retries: -1

1
puppet/services/pacemaker/cinder-volume.yaml
View File

@ -41,5 +41,6 @@ outputs:
- get_attr: [CinderVolumeBase, role_data, config_settings] - get_attr: [CinderVolumeBase, role_data, config_settings]
- cinder::volume::manage_service: false - cinder::volume::manage_service: false
cinder::volume::enabled: false cinder::volume::enabled: false
cinder::host: hostgroup
step_config: step_config:
include ::tripleo::profile::pacemaker::cinder::volume include ::tripleo::profile::pacemaker::cinder::volume

2
roles_data.yaml
View File

@ -124,7 +124,7 @@
- name: BlockStorage - name: BlockStorage
ServicesDefault: ServicesDefault:
- OS::TripleO::Services::CACerts - OS::TripleO::Services::CACerts
- OS::TripleO::Services::CinderVolume - OS::TripleO::Services::BlockStorageCinderVolume
- OS::TripleO::Services::Kernel - OS::TripleO::Services::Kernel
- OS::TripleO::Services::Ntp - OS::TripleO::Services::Ntp
- OS::TripleO::Services::Timezone - OS::TripleO::Services::Timezone