diff --git a/deployment/cinder/cinder-backup-pacemaker-puppet.yaml b/deployment/cinder/cinder-backup-pacemaker-puppet.yaml index 4af07eae3e..4bbe217bc5 100644 --- a/deployment/cinder/cinder-backup-pacemaker-puppet.yaml +++ b/deployment/cinder/cinder-backup-pacemaker-puppet.yaml @@ -16,7 +16,7 @@ parameters: 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'. + well, e.g. 'cluster.common.tag/IMAGENAME:pcmklatest'. type: boolean CinderBackupBackend: default: swift @@ -123,7 +123,7 @@ outputs: - common_tag_enabled - yaql: 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} expression: concat($.data.rightSplit(separator => ":", maxSplits => 1)[0], ":pcmklatest") tripleo::profile::pacemaker::cinder::backup_bundle::docker_volumes: {get_attr: [CinderCommon, cinder_backup_volumes]} diff --git a/deployment/cinder/cinder-volume-pacemaker-puppet.yaml b/deployment/cinder/cinder-volume-pacemaker-puppet.yaml index f6727bb5ad..d00908a3cb 100644 --- a/deployment/cinder/cinder-volume-pacemaker-puppet.yaml +++ b/deployment/cinder/cinder-volume-pacemaker-puppet.yaml @@ -16,7 +16,7 @@ parameters: 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'. + well, e.g. 'cluster.common.tag/IMAGENAME:pcmklatest'. type: boolean EndpointMap: default: {} @@ -109,7 +109,7 @@ outputs: - common_tag_enabled - yaql: 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} expression: concat($.data.rightSplit(separator => ":", maxSplits => 1)[0], ":pcmklatest") tripleo::profile::pacemaker::cinder::volume_bundle::docker_volumes: {get_attr: [CinderCommon, cinder_volume_volumes]} diff --git a/deployment/database/mysql-pacemaker-puppet.yaml b/deployment/database/mysql-pacemaker-puppet.yaml index 58d6aa41f1..6fc7ecda1a 100644 --- a/deployment/database/mysql-pacemaker-puppet.yaml +++ b/deployment/database/mysql-pacemaker-puppet.yaml @@ -16,7 +16,7 @@ parameters: 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'. + well, e.g. 'cluster.common.tag/IMAGENAME:pcmklatest'. type: boolean EndpointMap: default: {} @@ -138,7 +138,7 @@ outputs: - common_tag_enabled - yaql: 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} expression: concat($.data.rightSplit(separator => ":", maxSplits => 1)[0], ":pcmklatest") tripleo::profile::pacemaker::database::mysql_bundle::control_port: 3123 diff --git a/deployment/database/redis-pacemaker-puppet.yaml b/deployment/database/redis-pacemaker-puppet.yaml index e4b6b96f4d..dc9f28a7e4 100644 --- a/deployment/database/redis-pacemaker-puppet.yaml +++ b/deployment/database/redis-pacemaker-puppet.yaml @@ -16,7 +16,7 @@ parameters: 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'. + well, e.g. 'cluster.common.tag/IMAGENAME:pcmklatest'. type: boolean EndpointMap: default: {} @@ -108,7 +108,7 @@ outputs: - common_tag_enabled - yaql: 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} expression: concat($.data.rightSplit(separator => ":", maxSplits => 1)[0], ":pcmklatest") tripleo::profile::pacemaker::database::redis_bundle::control_port: 3124 diff --git a/deployment/haproxy/haproxy-pacemaker-puppet.yaml b/deployment/haproxy/haproxy-pacemaker-puppet.yaml index ab5165393c..953c1bbfc6 100644 --- a/deployment/haproxy/haproxy-pacemaker-puppet.yaml +++ b/deployment/haproxy/haproxy-pacemaker-puppet.yaml @@ -16,7 +16,7 @@ parameters: 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'. + well, e.g. 'cluster.common.tag/IMAGENAME:pcmklatest'. type: boolean ServiceData: default: {} @@ -191,7 +191,7 @@ outputs: - common_tag_enabled - yaql: 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} expression: concat($.data.rightSplit(separator => ":", maxSplits => 1)[0], ":pcmklatest") # BEGIN DOCKER SETTINGS diff --git a/deployment/manila/manila-share-pacemaker-puppet.yaml b/deployment/manila/manila-share-pacemaker-puppet.yaml index b38149a59d..229943e1a2 100644 --- a/deployment/manila/manila-share-pacemaker-puppet.yaml +++ b/deployment/manila/manila-share-pacemaker-puppet.yaml @@ -16,7 +16,7 @@ parameters: 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'. + well, e.g. 'cluster.common.tag/IMAGENAME:pcmklatest'. type: boolean EndpointMap: default: {} @@ -102,7 +102,7 @@ outputs: - common_tag_enabled - yaql: 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} expression: concat($.data.rightSplit(separator => ":", maxSplits => 1)[0], ":pcmklatest") tripleo::profile::pacemaker::manila::share_bundle::docker_volumes: {get_attr: [ManilaCommon, manila_share_volumes]} diff --git a/deployment/ovn/ovn-dbs-pacemaker-puppet.yaml b/deployment/ovn/ovn-dbs-pacemaker-puppet.yaml index 79a25df71e..fad189f680 100644 --- a/deployment/ovn/ovn-dbs-pacemaker-puppet.yaml +++ b/deployment/ovn/ovn-dbs-pacemaker-puppet.yaml @@ -16,7 +16,7 @@ parameters: 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'. + well, e.g. 'cluster.common.tag/IMAGENAME:pcmklatest'. type: boolean EndpointMap: default: {} @@ -120,7 +120,7 @@ outputs: - common_tag_enabled - yaql: 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} expression: concat($.data.rightSplit(separator => ":", maxSplits => 1)[0], ":pcmklatest") - tripleo::profile::pacemaker::ovn_dbs_bundle::nb_db_port: {get_param: OVNNorthboundServerPort} diff --git a/deployment/rabbitmq/rabbitmq-messaging-notify-pacemaker-puppet.yaml b/deployment/rabbitmq/rabbitmq-messaging-notify-pacemaker-puppet.yaml index 0d751b465c..d54cfabf22 100644 --- a/deployment/rabbitmq/rabbitmq-messaging-notify-pacemaker-puppet.yaml +++ b/deployment/rabbitmq/rabbitmq-messaging-notify-pacemaker-puppet.yaml @@ -16,7 +16,7 @@ parameters: 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'. + well, e.g. 'cluster.common.tag/IMAGENAME:pcmklatest'. type: boolean EndpointMap: default: {} @@ -102,7 +102,7 @@ outputs: - common_tag_enabled - yaql: 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} expression: concat($.data.rightSplit(separator => ":", maxSplits => 1)[0], ":pcmklatest") tripleo::profile::pacemaker::rabbitmq_bundle::control_port: 3122 diff --git a/deployment/rabbitmq/rabbitmq-messaging-pacemaker-puppet.yaml b/deployment/rabbitmq/rabbitmq-messaging-pacemaker-puppet.yaml index 5c46b1e8d1..e5bdc06949 100644 --- a/deployment/rabbitmq/rabbitmq-messaging-pacemaker-puppet.yaml +++ b/deployment/rabbitmq/rabbitmq-messaging-pacemaker-puppet.yaml @@ -16,7 +16,7 @@ parameters: 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'. + well, e.g. 'cluster.common.tag/IMAGENAME:pcmklatest'. type: boolean EndpointMap: default: {} @@ -102,7 +102,7 @@ outputs: - common_tag_enabled - yaql: 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} expression: concat($.data.rightSplit(separator => ":", maxSplits => 1)[0], ":pcmklatest") tripleo::profile::pacemaker::rabbitmq_bundle::control_port: 3122 diff --git a/deployment/rabbitmq/rabbitmq-messaging-rpc-pacemaker-puppet.yaml b/deployment/rabbitmq/rabbitmq-messaging-rpc-pacemaker-puppet.yaml index 3744167c9d..5027687d42 100644 --- a/deployment/rabbitmq/rabbitmq-messaging-rpc-pacemaker-puppet.yaml +++ b/deployment/rabbitmq/rabbitmq-messaging-rpc-pacemaker-puppet.yaml @@ -16,7 +16,7 @@ parameters: 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'. + well, e.g. 'cluster.common.tag/IMAGENAME:pcmklatest'. type: boolean EndpointMap: default: {} @@ -102,7 +102,7 @@ outputs: - common_tag_enabled - yaql: 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} expression: concat($.data.rightSplit(separator => ":", maxSplits => 1)[0], ":pcmklatest") tripleo::profile::pacemaker::rabbitmq_bundle::control_port: 3122 diff --git a/releasenotes/notes/pacemaker-cluster-common-tag-podman-f9a71344af5c73d6.yaml b/releasenotes/notes/pacemaker-cluster-common-tag-podman-f9a71344af5c73d6.yaml new file mode 100644 index 0000000000..e7d4b08711 --- /dev/null +++ b/releasenotes/notes/pacemaker-cluster-common-tag-podman-f9a71344af5c73d6.yaml @@ -0,0 +1,7 @@ +--- +fixes: + - | + HA container naming scheme has been updated to look like + 'container.common.tag/: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.