HA: Fix the cluster common tag behaviour with podman
Since [1,2], HA container image name used in pacemaker are look like container-common-tag/<servicename>:pcmklatest. Unlike docker, podman prepends a host information in front of this tag, which confuses the podman resource agent in pacemaker. Make the first part of the tag look like a fqdn so that podman doesn't change it. Closes-Bug: #1858648 [1] Id369154d147cd5cf0a6f997bf806084fc7580e01 [2] I7a63e8e2d9457c5025f3d70aeed6922e24958049 Change-Id: I07d72b87225dbadbc4df46564452ccb232593219
This commit is contained in:
parent
84a9adaaf7
commit
b61f71a74a
@ -16,7 +16,7 @@ parameters:
|
|||||||
to use a floating tag for its container image name,
|
to use a floating tag for its container image name,
|
||||||
e.g. 'REGISTRY/NAMESPACE/IMAGENAME:pcmklatest'. When
|
e.g. 'REGISTRY/NAMESPACE/IMAGENAME:pcmklatest'. When
|
||||||
set to true, the service uses a floating prefix as
|
set to true, the service uses a floating prefix as
|
||||||
well, e.g. 'cluster-common-tag/IMAGENAME:pcmklatest'.
|
well, e.g. 'cluster.common.tag/IMAGENAME:pcmklatest'.
|
||||||
type: boolean
|
type: boolean
|
||||||
CinderBackupBackend:
|
CinderBackupBackend:
|
||||||
default: swift
|
default: swift
|
||||||
@ -123,7 +123,7 @@ outputs:
|
|||||||
- common_tag_enabled
|
- common_tag_enabled
|
||||||
- yaql:
|
- yaql:
|
||||||
data: {get_param: ContainerCinderBackupImage}
|
data: {get_param: ContainerCinderBackupImage}
|
||||||
expression: concat("cluster-common-tag/", $.data.rightSplit(separator => "/", maxSplits => 1)[1])
|
expression: concat("cluster.common.tag/", $.data.rightSplit(separator => "/", maxSplits => 1)[1])
|
||||||
- {get_param: ContainerCinderBackupImage}
|
- {get_param: ContainerCinderBackupImage}
|
||||||
expression: concat($.data.rightSplit(separator => ":", maxSplits => 1)[0], ":pcmklatest")
|
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_volumes: {get_attr: [CinderCommon, cinder_backup_volumes]}
|
||||||
|
@ -16,7 +16,7 @@ parameters:
|
|||||||
to use a floating tag for its container image name,
|
to use a floating tag for its container image name,
|
||||||
e.g. 'REGISTRY/NAMESPACE/IMAGENAME:pcmklatest'. When
|
e.g. 'REGISTRY/NAMESPACE/IMAGENAME:pcmklatest'. When
|
||||||
set to true, the service uses a floating prefix as
|
set to true, the service uses a floating prefix as
|
||||||
well, e.g. 'cluster-common-tag/IMAGENAME:pcmklatest'.
|
well, e.g. 'cluster.common.tag/IMAGENAME:pcmklatest'.
|
||||||
type: boolean
|
type: boolean
|
||||||
EndpointMap:
|
EndpointMap:
|
||||||
default: {}
|
default: {}
|
||||||
@ -109,7 +109,7 @@ outputs:
|
|||||||
- common_tag_enabled
|
- common_tag_enabled
|
||||||
- yaql:
|
- yaql:
|
||||||
data: {get_param: ContainerCinderVolumeImage}
|
data: {get_param: ContainerCinderVolumeImage}
|
||||||
expression: concat("cluster-common-tag/", $.data.rightSplit(separator => "/", maxSplits => 1)[1])
|
expression: concat("cluster.common.tag/", $.data.rightSplit(separator => "/", maxSplits => 1)[1])
|
||||||
- {get_param: ContainerCinderVolumeImage}
|
- {get_param: ContainerCinderVolumeImage}
|
||||||
expression: concat($.data.rightSplit(separator => ":", maxSplits => 1)[0], ":pcmklatest")
|
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_volumes: {get_attr: [CinderCommon, cinder_volume_volumes]}
|
||||||
|
@ -16,7 +16,7 @@ parameters:
|
|||||||
to use a floating tag for its container image name,
|
to use a floating tag for its container image name,
|
||||||
e.g. 'REGISTRY/NAMESPACE/IMAGENAME:pcmklatest'. When
|
e.g. 'REGISTRY/NAMESPACE/IMAGENAME:pcmklatest'. When
|
||||||
set to true, the service uses a floating prefix as
|
set to true, the service uses a floating prefix as
|
||||||
well, e.g. 'cluster-common-tag/IMAGENAME:pcmklatest'.
|
well, e.g. 'cluster.common.tag/IMAGENAME:pcmklatest'.
|
||||||
type: boolean
|
type: boolean
|
||||||
EndpointMap:
|
EndpointMap:
|
||||||
default: {}
|
default: {}
|
||||||
@ -148,7 +148,7 @@ outputs:
|
|||||||
- common_tag_enabled
|
- common_tag_enabled
|
||||||
- yaql:
|
- yaql:
|
||||||
data: {get_param: ContainerMysqlImage}
|
data: {get_param: ContainerMysqlImage}
|
||||||
expression: concat("cluster-common-tag/", $.data.rightSplit(separator => "/", maxSplits => 1)[1])
|
expression: concat("cluster.common.tag/", $.data.rightSplit(separator => "/", maxSplits => 1)[1])
|
||||||
- {get_param: ContainerMysqlImage}
|
- {get_param: ContainerMysqlImage}
|
||||||
expression: concat($.data.rightSplit(separator => ":", maxSplits => 1)[0], ":pcmklatest")
|
expression: concat($.data.rightSplit(separator => ":", maxSplits => 1)[0], ":pcmklatest")
|
||||||
tripleo::profile::pacemaker::database::mysql_bundle::control_port: 3123
|
tripleo::profile::pacemaker::database::mysql_bundle::control_port: 3123
|
||||||
|
@ -16,7 +16,7 @@ parameters:
|
|||||||
to use a floating tag for its container image name,
|
to use a floating tag for its container image name,
|
||||||
e.g. 'REGISTRY/NAMESPACE/IMAGENAME:pcmklatest'. When
|
e.g. 'REGISTRY/NAMESPACE/IMAGENAME:pcmklatest'. When
|
||||||
set to true, the service uses a floating prefix as
|
set to true, the service uses a floating prefix as
|
||||||
well, e.g. 'cluster-common-tag/IMAGENAME:pcmklatest'.
|
well, e.g. 'cluster.common.tag/IMAGENAME:pcmklatest'.
|
||||||
type: boolean
|
type: boolean
|
||||||
EndpointMap:
|
EndpointMap:
|
||||||
default: {}
|
default: {}
|
||||||
@ -114,7 +114,7 @@ outputs:
|
|||||||
- common_tag_enabled
|
- common_tag_enabled
|
||||||
- yaql:
|
- yaql:
|
||||||
data: {get_param: ContainerRedisImage}
|
data: {get_param: ContainerRedisImage}
|
||||||
expression: concat("cluster-common-tag/", $.data.rightSplit(separator => "/", maxSplits => 1)[1])
|
expression: concat("cluster.common.tag/", $.data.rightSplit(separator => "/", maxSplits => 1)[1])
|
||||||
- {get_param: ContainerRedisImage}
|
- {get_param: ContainerRedisImage}
|
||||||
expression: concat($.data.rightSplit(separator => ":", maxSplits => 1)[0], ":pcmklatest")
|
expression: concat($.data.rightSplit(separator => ":", maxSplits => 1)[0], ":pcmklatest")
|
||||||
tripleo::profile::pacemaker::database::redis_bundle::control_port: 3124
|
tripleo::profile::pacemaker::database::redis_bundle::control_port: 3124
|
||||||
|
@ -16,7 +16,7 @@ parameters:
|
|||||||
to use a floating tag for its container image name,
|
to use a floating tag for its container image name,
|
||||||
e.g. 'REGISTRY/NAMESPACE/IMAGENAME:pcmklatest'. When
|
e.g. 'REGISTRY/NAMESPACE/IMAGENAME:pcmklatest'. When
|
||||||
set to true, the service uses a floating prefix as
|
set to true, the service uses a floating prefix as
|
||||||
well, e.g. 'cluster-common-tag/IMAGENAME:pcmklatest'.
|
well, e.g. 'cluster.common.tag/IMAGENAME:pcmklatest'.
|
||||||
type: boolean
|
type: boolean
|
||||||
ServiceData:
|
ServiceData:
|
||||||
default: {}
|
default: {}
|
||||||
@ -191,7 +191,7 @@ outputs:
|
|||||||
- common_tag_enabled
|
- common_tag_enabled
|
||||||
- yaql:
|
- yaql:
|
||||||
data: {get_param: ContainerHAProxyImage}
|
data: {get_param: ContainerHAProxyImage}
|
||||||
expression: concat("cluster-common-tag/", $.data.rightSplit(separator => "/", maxSplits => 1)[1])
|
expression: concat("cluster.common.tag/", $.data.rightSplit(separator => "/", maxSplits => 1)[1])
|
||||||
- {get_param: ContainerHAProxyImage}
|
- {get_param: ContainerHAProxyImage}
|
||||||
expression: concat($.data.rightSplit(separator => ":", maxSplits => 1)[0], ":pcmklatest")
|
expression: concat($.data.rightSplit(separator => ":", maxSplits => 1)[0], ":pcmklatest")
|
||||||
# BEGIN DOCKER SETTINGS
|
# BEGIN DOCKER SETTINGS
|
||||||
|
@ -16,7 +16,7 @@ parameters:
|
|||||||
to use a floating tag for its container image name,
|
to use a floating tag for its container image name,
|
||||||
e.g. 'REGISTRY/NAMESPACE/IMAGENAME:pcmklatest'. When
|
e.g. 'REGISTRY/NAMESPACE/IMAGENAME:pcmklatest'. When
|
||||||
set to true, the service uses a floating prefix as
|
set to true, the service uses a floating prefix as
|
||||||
well, e.g. 'cluster-common-tag/IMAGENAME:pcmklatest'.
|
well, e.g. 'cluster.common.tag/IMAGENAME:pcmklatest'.
|
||||||
type: boolean
|
type: boolean
|
||||||
EndpointMap:
|
EndpointMap:
|
||||||
default: {}
|
default: {}
|
||||||
@ -102,7 +102,7 @@ outputs:
|
|||||||
- common_tag_enabled
|
- common_tag_enabled
|
||||||
- yaql:
|
- yaql:
|
||||||
data: {get_param: ContainerManilaShareImage}
|
data: {get_param: ContainerManilaShareImage}
|
||||||
expression: concat("cluster-common-tag/", $.data.rightSplit(separator => "/", maxSplits => 1)[1])
|
expression: concat("cluster.common.tag/", $.data.rightSplit(separator => "/", maxSplits => 1)[1])
|
||||||
- {get_param: ContainerManilaShareImage}
|
- {get_param: ContainerManilaShareImage}
|
||||||
expression: concat($.data.rightSplit(separator => ":", maxSplits => 1)[0], ":pcmklatest")
|
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_volumes: {get_attr: [ManilaCommon, manila_share_volumes]}
|
||||||
|
@ -16,7 +16,7 @@ parameters:
|
|||||||
to use a floating tag for its container image name,
|
to use a floating tag for its container image name,
|
||||||
e.g. 'REGISTRY/NAMESPACE/IMAGENAME:pcmklatest'. When
|
e.g. 'REGISTRY/NAMESPACE/IMAGENAME:pcmklatest'. When
|
||||||
set to true, the service uses a floating prefix as
|
set to true, the service uses a floating prefix as
|
||||||
well, e.g. 'cluster-common-tag/IMAGENAME:pcmklatest'.
|
well, e.g. 'cluster.common.tag/IMAGENAME:pcmklatest'.
|
||||||
type: boolean
|
type: boolean
|
||||||
EndpointMap:
|
EndpointMap:
|
||||||
default: {}
|
default: {}
|
||||||
@ -128,7 +128,7 @@ outputs:
|
|||||||
- common_tag_enabled
|
- common_tag_enabled
|
||||||
- yaql:
|
- yaql:
|
||||||
data: {get_param: ContainerOvnDbsImage}
|
data: {get_param: ContainerOvnDbsImage}
|
||||||
expression: concat("cluster-common-tag/", $.data.rightSplit(separator => "/", maxSplits => 1)[1])
|
expression: concat("cluster.common.tag/", $.data.rightSplit(separator => "/", maxSplits => 1)[1])
|
||||||
- {get_param: ContainerOvnDbsImage}
|
- {get_param: ContainerOvnDbsImage}
|
||||||
expression: concat($.data.rightSplit(separator => ":", maxSplits => 1)[0], ":pcmklatest")
|
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::nb_db_port: {get_param: OVNNorthboundServerPort}
|
||||||
|
@ -16,7 +16,7 @@ parameters:
|
|||||||
to use a floating tag for its container image name,
|
to use a floating tag for its container image name,
|
||||||
e.g. 'REGISTRY/NAMESPACE/IMAGENAME:pcmklatest'. When
|
e.g. 'REGISTRY/NAMESPACE/IMAGENAME:pcmklatest'. When
|
||||||
set to true, the service uses a floating prefix as
|
set to true, the service uses a floating prefix as
|
||||||
well, e.g. 'cluster-common-tag/IMAGENAME:pcmklatest'.
|
well, e.g. 'cluster.common.tag/IMAGENAME:pcmklatest'.
|
||||||
type: boolean
|
type: boolean
|
||||||
EndpointMap:
|
EndpointMap:
|
||||||
default: {}
|
default: {}
|
||||||
@ -109,7 +109,7 @@ outputs:
|
|||||||
- common_tag_enabled
|
- common_tag_enabled
|
||||||
- yaql:
|
- yaql:
|
||||||
data: {get_param: ContainerRabbitmqImage}
|
data: {get_param: ContainerRabbitmqImage}
|
||||||
expression: concat("cluster-common-tag/", $.data.rightSplit(separator => "/", maxSplits => 1)[1])
|
expression: concat("cluster.common.tag/", $.data.rightSplit(separator => "/", maxSplits => 1)[1])
|
||||||
- {get_param: ContainerRabbitmqImage}
|
- {get_param: ContainerRabbitmqImage}
|
||||||
expression: concat($.data.rightSplit(separator => ":", maxSplits => 1)[0], ":pcmklatest")
|
expression: concat($.data.rightSplit(separator => ":", maxSplits => 1)[0], ":pcmklatest")
|
||||||
tripleo::profile::pacemaker::rabbitmq_bundle::control_port: 3122
|
tripleo::profile::pacemaker::rabbitmq_bundle::control_port: 3122
|
||||||
|
@ -16,7 +16,7 @@ parameters:
|
|||||||
to use a floating tag for its container image name,
|
to use a floating tag for its container image name,
|
||||||
e.g. 'REGISTRY/NAMESPACE/IMAGENAME:pcmklatest'. When
|
e.g. 'REGISTRY/NAMESPACE/IMAGENAME:pcmklatest'. When
|
||||||
set to true, the service uses a floating prefix as
|
set to true, the service uses a floating prefix as
|
||||||
well, e.g. 'cluster-common-tag/IMAGENAME:pcmklatest'.
|
well, e.g. 'cluster.common.tag/IMAGENAME:pcmklatest'.
|
||||||
type: boolean
|
type: boolean
|
||||||
EndpointMap:
|
EndpointMap:
|
||||||
default: {}
|
default: {}
|
||||||
@ -109,7 +109,7 @@ outputs:
|
|||||||
- common_tag_enabled
|
- common_tag_enabled
|
||||||
- yaql:
|
- yaql:
|
||||||
data: {get_param: ContainerRabbitmqImage}
|
data: {get_param: ContainerRabbitmqImage}
|
||||||
expression: concat("cluster-common-tag/", $.data.rightSplit(separator => "/", maxSplits => 1)[1])
|
expression: concat("cluster.common.tag/", $.data.rightSplit(separator => "/", maxSplits => 1)[1])
|
||||||
- {get_param: ContainerRabbitmqImage}
|
- {get_param: ContainerRabbitmqImage}
|
||||||
expression: concat($.data.rightSplit(separator => ":", maxSplits => 1)[0], ":pcmklatest")
|
expression: concat($.data.rightSplit(separator => ":", maxSplits => 1)[0], ":pcmklatest")
|
||||||
tripleo::profile::pacemaker::rabbitmq_bundle::control_port: 3122
|
tripleo::profile::pacemaker::rabbitmq_bundle::control_port: 3122
|
||||||
|
@ -16,7 +16,7 @@ parameters:
|
|||||||
to use a floating tag for its container image name,
|
to use a floating tag for its container image name,
|
||||||
e.g. 'REGISTRY/NAMESPACE/IMAGENAME:pcmklatest'. When
|
e.g. 'REGISTRY/NAMESPACE/IMAGENAME:pcmklatest'. When
|
||||||
set to true, the service uses a floating prefix as
|
set to true, the service uses a floating prefix as
|
||||||
well, e.g. 'cluster-common-tag/IMAGENAME:pcmklatest'.
|
well, e.g. 'cluster.common.tag/IMAGENAME:pcmklatest'.
|
||||||
type: boolean
|
type: boolean
|
||||||
EndpointMap:
|
EndpointMap:
|
||||||
default: {}
|
default: {}
|
||||||
@ -109,7 +109,7 @@ outputs:
|
|||||||
- common_tag_enabled
|
- common_tag_enabled
|
||||||
- yaql:
|
- yaql:
|
||||||
data: {get_param: ContainerRabbitmqImage}
|
data: {get_param: ContainerRabbitmqImage}
|
||||||
expression: concat("cluster-common-tag/", $.data.rightSplit(separator => "/", maxSplits => 1)[1])
|
expression: concat("cluster.common.tag/", $.data.rightSplit(separator => "/", maxSplits => 1)[1])
|
||||||
- {get_param: ContainerRabbitmqImage}
|
- {get_param: ContainerRabbitmqImage}
|
||||||
expression: concat($.data.rightSplit(separator => ":", maxSplits => 1)[0], ":pcmklatest")
|
expression: concat($.data.rightSplit(separator => ":", maxSplits => 1)[0], ":pcmklatest")
|
||||||
tripleo::profile::pacemaker::rabbitmq_bundle::control_port: 3122
|
tripleo::profile::pacemaker::rabbitmq_bundle::control_port: 3122
|
||||||
|
@ -0,0 +1,7 @@
|
|||||||
|
---
|
||||||
|
fixes:
|
||||||
|
- |
|
||||||
|
HA container naming scheme has been updated to look like
|
||||||
|
'container.common.tag/<servicename>:pcmklatest', in order for
|
||||||
|
podman to not prepend any host suffix in front of this tag,
|
||||||
|
otherwise this confuses the podman resource agent in pacemaker.
|
Loading…
Reference in New Issue
Block a user