Cinder volume service is not managed by Pacemaker on BlockStorage
We do not want cinder-volume to be managed by Pacemaker on BlockStorage nodes, where Pacemaker is not running at all. This change adds a new BlockStorageCinderVolume service name which can (and is, by default) mapped to the non Pacemaker implementation of the service. The error was: Could not find dependency Exec[wait-for-settle] for Pacemaker::Resource::Systemd[openstack-cinder-volume] Also moves cinder::host setting into the Pacemaker specific service definition because we only want to set a shared host= string when the service is managed by Pacemaker. Closes-Bug: #1628912 Change-Id: I2f7e82db4fdfd5f161e44d65d17893c3e19a89c9
This commit is contained in:
parent
4cdc4fc673
commit
7822c9756a
|
@ -109,6 +109,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
|
||||||
|
|
|
@ -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
|
||||||
|
|
|
@ -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
|
||||||
|
|
|
@ -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
|
||||||
|
|
Loading…
Reference in New Issue