Merge "HA: minor update of arbitrary container image name" into stable/queens
This commit is contained in:
commit
e73555f0c3
|
@ -10,6 +10,14 @@ parameters:
|
|||
DockerCinderConfigImage:
|
||||
description: The container image to use for the cinder config_volume
|
||||
type: string
|
||||
ClusterCommonTag:
|
||||
default: false
|
||||
description: When set to false, a pacemaker service is configured
|
||||
to use a floating tag for its container image name,
|
||||
e.g. 'REGISTRY/NAMESPACE/IMAGENAME:pcmklatest'. When
|
||||
set to true, the service uses a floating prefix as
|
||||
well, e.g. 'cluster-common-tag/IMAGENAME:pcmklatest'.
|
||||
type: boolean
|
||||
CinderBackupBackend:
|
||||
default: swift
|
||||
description: The short name of the Cinder Backup backend to use.
|
||||
|
@ -61,6 +69,7 @@ parameters:
|
|||
|
||||
conditions:
|
||||
puppet_debug_enabled: {get_param: ConfigDebug}
|
||||
common_tag_enabled: {equals: [{get_param: ClusterCommonTag}, true]}
|
||||
|
||||
resources:
|
||||
|
||||
|
@ -95,12 +104,15 @@ outputs:
|
|||
map_merge:
|
||||
- get_attr: [CinderBackupBase, role_data, config_settings]
|
||||
- tripleo::profile::pacemaker::cinder::backup_bundle::cinder_backup_docker_image: &cinder_backup_image_pcmklatest
|
||||
list_join:
|
||||
- ':'
|
||||
- - yaql:
|
||||
data: {get_param: DockerCinderBackupImage}
|
||||
expression: $.data.rightSplit(separator => ":", maxSplits => 1)[0]
|
||||
- 'pcmklatest'
|
||||
yaql:
|
||||
data:
|
||||
if:
|
||||
- common_tag_enabled
|
||||
- yaql:
|
||||
data: {get_param: DockerCinderBackupImage}
|
||||
expression: concat("cluster-common-tag/", $.data.rightSplit(separator => "/", maxSplits => 1)[1])
|
||||
- {get_param: DockerCinderBackupImage}
|
||||
expression: concat($.data.rightSplit(separator => ":", maxSplits => 1)[0], ":pcmklatest")
|
||||
tripleo::profile::pacemaker::cinder::backup_bundle::docker_volumes: {get_attr: [CinderCommon, cinder_backup_volumes]}
|
||||
tripleo::profile::pacemaker::cinder::backup_bundle::docker_environment: {get_attr: [CinderCommon, cinder_backup_environment]}
|
||||
cinder::backup::manage_service: false
|
||||
|
|
|
@ -10,6 +10,14 @@ parameters:
|
|||
DockerCinderConfigImage:
|
||||
description: The container image to use for the cinder config_volume
|
||||
type: string
|
||||
ClusterCommonTag:
|
||||
default: false
|
||||
description: When set to false, a pacemaker service is configured
|
||||
to use a floating tag for its container image name,
|
||||
e.g. 'REGISTRY/NAMESPACE/IMAGENAME:pcmklatest'. When
|
||||
set to true, the service uses a floating prefix as
|
||||
well, e.g. 'cluster-common-tag/IMAGENAME:pcmklatest'.
|
||||
type: boolean
|
||||
EndpointMap:
|
||||
default: {}
|
||||
description: Mapping of service endpoint -> protocol. Typically set
|
||||
|
@ -49,6 +57,7 @@ parameters:
|
|||
|
||||
conditions:
|
||||
puppet_debug_enabled: {get_param: ConfigDebug}
|
||||
common_tag_enabled: {equals: [{get_param: ClusterCommonTag}, true]}
|
||||
|
||||
resources:
|
||||
|
||||
|
@ -81,12 +90,15 @@ outputs:
|
|||
- get_attr: [CinderBase, role_data, config_settings]
|
||||
- tripleo::profile::base::lvm::enable_udev: false
|
||||
tripleo::profile::pacemaker::cinder::volume_bundle::cinder_volume_docker_image: &cinder_volume_image_pcmklatest
|
||||
list_join:
|
||||
- ':'
|
||||
- - yaql:
|
||||
data: {get_param: DockerCinderVolumeImage}
|
||||
expression: $.data.rightSplit(separator => ":", maxSplits => 1)[0]
|
||||
- 'pcmklatest'
|
||||
yaql:
|
||||
data:
|
||||
if:
|
||||
- common_tag_enabled
|
||||
- yaql:
|
||||
data: {get_param: DockerCinderVolumeImage}
|
||||
expression: concat("cluster-common-tag/", $.data.rightSplit(separator => "/", maxSplits => 1)[1])
|
||||
- {get_param: DockerCinderVolumeImage}
|
||||
expression: concat($.data.rightSplit(separator => ":", maxSplits => 1)[0], ":pcmklatest")
|
||||
tripleo::profile::pacemaker::cinder::volume_bundle::docker_volumes: {get_attr: [CinderCommon, cinder_volume_volumes]}
|
||||
tripleo::profile::pacemaker::cinder::volume_bundle::docker_environment: {get_attr: [CinderCommon, cinder_volume_environment]}
|
||||
cinder::volume::manage_service: false
|
||||
|
|
|
@ -10,6 +10,14 @@ parameters:
|
|||
DockerMysqlConfigImage:
|
||||
description: The container image to use for the mysql config_volume
|
||||
type: string
|
||||
ClusterCommonTag:
|
||||
default: false
|
||||
description: When set to false, a pacemaker service is configured
|
||||
to use a floating tag for its container image name,
|
||||
e.g. 'REGISTRY/NAMESPACE/IMAGENAME:pcmklatest'. When
|
||||
set to true, the service uses a floating prefix as
|
||||
well, e.g. 'cluster-common-tag/IMAGENAME:pcmklatest'.
|
||||
type: boolean
|
||||
EndpointMap:
|
||||
default: {}
|
||||
description: Mapping of service endpoint -> protocol. Typically set
|
||||
|
@ -80,6 +88,7 @@ resources:
|
|||
conditions:
|
||||
puppet_debug_enabled: {get_param: ConfigDebug}
|
||||
internal_tls_enabled: {equals: [{get_param: EnableInternalTLS}, true]}
|
||||
common_tag_enabled: {equals: [{get_param: ClusterCommonTag}, true]}
|
||||
|
||||
outputs:
|
||||
role_data:
|
||||
|
@ -90,12 +99,15 @@ outputs:
|
|||
map_merge:
|
||||
- {get_attr: [MysqlPuppetBase, role_data, config_settings]}
|
||||
- tripleo::profile::pacemaker::database::mysql_bundle::mysql_docker_image: &mysql_image_pcmklatest
|
||||
list_join:
|
||||
- ':'
|
||||
- - yaql:
|
||||
data: {get_param: DockerMysqlImage}
|
||||
expression: $.data.rightSplit(separator => ":", maxSplits => 1)[0]
|
||||
- 'pcmklatest'
|
||||
yaql:
|
||||
data:
|
||||
if:
|
||||
- common_tag_enabled
|
||||
- yaql:
|
||||
data: {get_param: DockerMysqlImage}
|
||||
expression: concat("cluster-common-tag/", $.data.rightSplit(separator => "/", maxSplits => 1)[1])
|
||||
- {get_param: DockerMysqlImage}
|
||||
expression: concat($.data.rightSplit(separator => ":", maxSplits => 1)[0], ":pcmklatest")
|
||||
tripleo::profile::pacemaker::database::mysql_bundle::control_port: 3123
|
||||
tripleo.mysql.firewall_rules:
|
||||
'104 mysql galera-bundle':
|
||||
|
|
|
@ -10,6 +10,14 @@ parameters:
|
|||
DockerRedisConfigImage:
|
||||
description: The container image to use for the redis config_volume
|
||||
type: string
|
||||
ClusterCommonTag:
|
||||
default: false
|
||||
description: When set to false, a pacemaker service is configured
|
||||
to use a floating tag for its container image name,
|
||||
e.g. 'REGISTRY/NAMESPACE/IMAGENAME:pcmklatest'. When
|
||||
set to true, the service uses a floating prefix as
|
||||
well, e.g. 'cluster-common-tag/IMAGENAME:pcmklatest'.
|
||||
type: boolean
|
||||
EndpointMap:
|
||||
default: {}
|
||||
description: Mapping of service endpoint -> protocol. Typically set
|
||||
|
@ -58,6 +66,7 @@ conditions:
|
|||
puppet_debug_enabled: {get_param: ConfigDebug}
|
||||
internal_tls_enabled: {equals: [{get_param: EnableInternalTLS}, true]}
|
||||
redis_ipv6: {get_param: RedisIPv6}
|
||||
common_tag_enabled: {equals: [{get_param: ClusterCommonTag}, true]}
|
||||
|
||||
resources:
|
||||
|
||||
|
@ -86,12 +95,15 @@ outputs:
|
|||
redis::notify_service: false
|
||||
redis::managed_by_cluster_manager: true
|
||||
tripleo::profile::pacemaker::database::redis_bundle::redis_docker_image: &redis_image_pcmklatest
|
||||
list_join:
|
||||
- ':'
|
||||
- - yaql:
|
||||
data: {get_param: DockerRedisImage}
|
||||
expression: $.data.rightSplit(separator => ":", maxSplits => 1)[0]
|
||||
- 'pcmklatest'
|
||||
yaql:
|
||||
data:
|
||||
if:
|
||||
- common_tag_enabled
|
||||
- yaql:
|
||||
data: {get_param: DockerRedisImage}
|
||||
expression: concat("cluster-common-tag/", $.data.rightSplit(separator => "/", maxSplits => 1)[1])
|
||||
- {get_param: DockerRedisImage}
|
||||
expression: concat($.data.rightSplit(separator => ":", maxSplits => 1)[0], ":pcmklatest")
|
||||
tripleo::profile::pacemaker::database::redis_bundle::control_port: 3124
|
||||
tripleo.redis.firewall_rules:
|
||||
'108 redis-bundle':
|
||||
|
|
|
@ -10,6 +10,14 @@ parameters:
|
|||
DockerHAProxyConfigImage:
|
||||
description: The container image to use for the haproxy config_volume
|
||||
type: string
|
||||
ClusterCommonTag:
|
||||
default: false
|
||||
description: When set to false, a pacemaker service is configured
|
||||
to use a floating tag for its container image name,
|
||||
e.g. 'REGISTRY/NAMESPACE/IMAGENAME:pcmklatest'. When
|
||||
set to true, the service uses a floating prefix as
|
||||
well, e.g. 'cluster-common-tag/IMAGENAME:pcmklatest'.
|
||||
type: boolean
|
||||
ServiceData:
|
||||
default: {}
|
||||
description: Dictionary packing service data
|
||||
|
@ -97,6 +105,7 @@ conditions:
|
|||
- equals:
|
||||
- {get_param: PublicSSLCertificateAutogenerated}
|
||||
- true
|
||||
common_tag_enabled: {equals: [{get_param: ClusterCommonTag}, true]}
|
||||
|
||||
resources:
|
||||
|
||||
|
@ -138,12 +147,15 @@ outputs:
|
|||
# disable the use CRL file until we can restart the container when the file expires
|
||||
tripleo::haproxy::crl_file: null
|
||||
tripleo::profile::pacemaker::haproxy_bundle::haproxy_docker_image: &haproxy_image_pcmklatest
|
||||
list_join:
|
||||
- ':'
|
||||
- - yaql:
|
||||
data: {get_param: DockerHAProxyImage}
|
||||
expression: $.data.rightSplit(separator => ":", maxSplits => 1)[0]
|
||||
- 'pcmklatest'
|
||||
yaql:
|
||||
data:
|
||||
if:
|
||||
- common_tag_enabled
|
||||
- yaql:
|
||||
data: {get_param: DockerHAProxyImage}
|
||||
expression: concat("cluster-common-tag/", $.data.rightSplit(separator => "/", maxSplits => 1)[1])
|
||||
- {get_param: DockerHAProxyImage}
|
||||
expression: concat($.data.rightSplit(separator => ":", maxSplits => 1)[0], ":pcmklatest")
|
||||
logging_source: {get_attr: [HAProxyBase, role_data, logging_source]}
|
||||
logging_groups: {get_attr: [HAProxyBase, role_data, logging_groups]}
|
||||
service_config_settings: {get_attr: [HAProxyBase, role_data, service_config_settings]}
|
||||
|
|
|
@ -10,6 +10,14 @@ parameters:
|
|||
DockerManilaConfigImage:
|
||||
description: image
|
||||
type: string
|
||||
ClusterCommonTag:
|
||||
default: false
|
||||
description: When set to false, a pacemaker service is configured
|
||||
to use a floating tag for its container image name,
|
||||
e.g. 'REGISTRY/NAMESPACE/IMAGENAME:pcmklatest'. When
|
||||
set to true, the service uses a floating prefix as
|
||||
well, e.g. 'cluster-common-tag/IMAGENAME:pcmklatest'.
|
||||
type: boolean
|
||||
EndpointMap:
|
||||
default: {}
|
||||
description: Mapping of service endpoint -> protocol. Typically set
|
||||
|
@ -49,6 +57,7 @@ parameters:
|
|||
|
||||
conditions:
|
||||
puppet_debug_enabled: {get_param: ConfigDebug}
|
||||
common_tag_enabled: {equals: [{get_param: ClusterCommonTag}, true]}
|
||||
|
||||
resources:
|
||||
|
||||
|
@ -80,12 +89,15 @@ outputs:
|
|||
map_merge:
|
||||
- get_attr: [ManilaBase, role_data, config_settings]
|
||||
- tripleo::profile::pacemaker::manila::share_bundle::manila_share_docker_image: &manila_share_image_pcmklatest
|
||||
list_join:
|
||||
- ':'
|
||||
- - yaql:
|
||||
data: {get_param: DockerManilaShareImage}
|
||||
expression: $.data.rightSplit(separator => ":", maxSplits => 1)[0]
|
||||
- 'pcmklatest'
|
||||
yaql:
|
||||
data:
|
||||
if:
|
||||
- common_tag_enabled
|
||||
- yaql:
|
||||
data: {get_param: DockerManilaShareImage}
|
||||
expression: concat("cluster-common-tag/", $.data.rightSplit(separator => "/", maxSplits => 1)[1])
|
||||
- {get_param: DockerManilaShareImage}
|
||||
expression: concat($.data.rightSplit(separator => ":", maxSplits => 1)[0], ":pcmklatest")
|
||||
tripleo::profile::pacemaker::manila::share_bundle::docker_volumes: {get_attr: [ManilaCommon, manila_share_volumes]}
|
||||
tripleo::profile::pacemaker::manila::share_bundle::docker_environment: {get_attr: [ManilaCommon, manila_share_environment]}
|
||||
manila::share::manage_service: false
|
||||
|
|
|
@ -10,6 +10,14 @@ parameters:
|
|||
DockerOvnDbsConfigImage:
|
||||
description: image
|
||||
type: string
|
||||
ClusterCommonTag:
|
||||
default: false
|
||||
description: When set to false, a pacemaker service is configured
|
||||
to use a floating tag for its container image name,
|
||||
e.g. 'REGISTRY/NAMESPACE/IMAGENAME:pcmklatest'. When
|
||||
set to true, the service uses a floating prefix as
|
||||
well, e.g. 'cluster-common-tag/IMAGENAME:pcmklatest'.
|
||||
type: boolean
|
||||
EndpointMap:
|
||||
default: {}
|
||||
description: Mapping of service endpoint -> protocol. Typically set
|
||||
|
@ -61,6 +69,7 @@ parameters:
|
|||
|
||||
conditions:
|
||||
puppet_debug_enabled: {get_param: ConfigDebug}
|
||||
common_tag_enabled: {equals: [{get_param: ClusterCommonTag}, true]}
|
||||
|
||||
resources:
|
||||
|
||||
|
@ -88,12 +97,15 @@ outputs:
|
|||
map_merge:
|
||||
- get_attr: [OVNDbsBase, role_data, config_settings]
|
||||
- tripleo::profile::pacemaker::ovn_dbs_bundle::ovn_dbs_docker_image: &ovn_dbs_image_pcmklatest
|
||||
list_join:
|
||||
- ':'
|
||||
- - yaql:
|
||||
data: {get_param: DockerOvnDbsImage}
|
||||
expression: $.data.rightSplit(separator => ":", maxSplits => 1)[0]
|
||||
- 'pcmklatest'
|
||||
yaql:
|
||||
data:
|
||||
if:
|
||||
- common_tag_enabled
|
||||
- yaql:
|
||||
data: {get_param: DockerOvnDbsImage}
|
||||
expression: concat("cluster-common-tag/", $.data.rightSplit(separator => "/", maxSplits => 1)[1])
|
||||
- {get_param: DockerOvnDbsImage}
|
||||
expression: concat($.data.rightSplit(separator => ":", maxSplits => 1)[0], ":pcmklatest")
|
||||
- tripleo::profile::pacemaker::ovn_dbs_bundle::nb_db_port: {get_param: OVNNorthboundServerPort}
|
||||
- tripleo::profile::pacemaker::ovn_dbs_bundle::sb_db_port: {get_param: OVNSouthboundServerPort}
|
||||
- tripleo::profile::pacemaker::ovn_dbs_bundle::dbs_timeout: {get_param: OVNDBSPacemakerTimeout}
|
||||
|
|
|
@ -10,6 +10,14 @@ parameters:
|
|||
DockerRabbitmqConfigImage:
|
||||
description: The container image to use for the rabbitmq config_volume
|
||||
type: string
|
||||
ClusterCommonTag:
|
||||
default: false
|
||||
description: When set to false, a pacemaker service is configured
|
||||
to use a floating tag for its container image name,
|
||||
e.g. 'REGISTRY/NAMESPACE/IMAGENAME:pcmklatest'. When
|
||||
set to true, the service uses a floating prefix as
|
||||
well, e.g. 'cluster-common-tag/IMAGENAME:pcmklatest'.
|
||||
type: boolean
|
||||
EndpointMap:
|
||||
default: {}
|
||||
description: Mapping of service endpoint -> protocol. Typically set
|
||||
|
@ -53,6 +61,7 @@ parameters:
|
|||
|
||||
conditions:
|
||||
puppet_debug_enabled: {get_param: ConfigDebug}
|
||||
common_tag_enabled: {equals: [{get_param: ClusterCommonTag}, true]}
|
||||
|
||||
resources:
|
||||
|
||||
|
@ -79,12 +88,15 @@ outputs:
|
|||
- {get_attr: [RabbitmqBase, role_data, config_settings]}
|
||||
- rabbitmq::service_manage: false
|
||||
tripleo::profile::pacemaker::rabbitmq_bundle::rabbitmq_docker_image: &rabbitmq_image_pcmklatest
|
||||
list_join:
|
||||
- ':'
|
||||
- - yaql:
|
||||
data: {get_param: DockerRabbitmqImage}
|
||||
expression: $.data.rightSplit(separator => ":", maxSplits => 1)[0]
|
||||
- 'pcmklatest'
|
||||
yaql:
|
||||
data:
|
||||
if:
|
||||
- common_tag_enabled
|
||||
- yaql:
|
||||
data: {get_param: DockerRabbitmqImage}
|
||||
expression: concat("cluster-common-tag/", $.data.rightSplit(separator => "/", maxSplits => 1)[1])
|
||||
- {get_param: DockerRabbitmqImage}
|
||||
expression: concat($.data.rightSplit(separator => ":", maxSplits => 1)[0], ":pcmklatest")
|
||||
tripleo::profile::pacemaker::rabbitmq_bundle::control_port: 3122
|
||||
tripleo.rabbitmq.firewall_rules:
|
||||
'109 rabbitmq-bundle':
|
||||
|
|
|
@ -0,0 +1,12 @@
|
|||
---
|
||||
features:
|
||||
- HA services use a special container image name derived from the one
|
||||
configured in Heat parameter plus a fixed tag part, i.e.
|
||||
'<registry>/<namespace>/<servicename>:pcmklatest'. To implement rolling
|
||||
update without service disruption, this 'pcmklatest' tag is adjusted
|
||||
automatically during minor update every time a new image is pulled.
|
||||
A new Heat parameter ClusterCommonTag can now control the prefix part
|
||||
of the container image name. When set to true, the container name
|
||||
for HA services will look like
|
||||
'container-common-tag/<servicename>:pcmklatest'. This allows rolling
|
||||
update of HA services even when the <namespace> changes in Heat.
|
Loading…
Reference in New Issue