Convert Docker*Image parameters

This converts all Docker*Image parameter varients into
Container*Image varients.

The commit was autogenerated with the following shell commands:

for file in $(grep -lr Docker.*Image --include \*.yaml --exclude-dir releasenotes); do
  sed -e "s|Docker\([^ ]*Image\)|Container\1|g" -i $file
done

Change-Id: Iab06efa5616975b99aa5772a65b415629f8d7882
Depends-On: I7d62a3424ccb7b01dc101329018ebda896ea8ff3
Depends-On: Ib1dc0c08ce7971a03639acc42b1e738d93a52f98
changes/50/651550/13
Dan Prince 3 years ago committed by Alex Schultz
parent 24608f6513
commit a68151d02a
  1. 8
      deployment/aodh/aodh-api-container-puppet.yaml
  2. 8
      deployment/aodh/aodh-evaluator-container-puppet.yaml
  3. 8
      deployment/aodh/aodh-listener-container-puppet.yaml
  4. 8
      deployment/aodh/aodh-notifier-container-puppet.yaml
  5. 16
      deployment/barbican/barbican-api-container-puppet.yaml
  6. 8
      deployment/cavium/liquidio-compute-config-container-puppet.yaml
  7. 8
      deployment/ceilometer/ceilometer-agent-central-container-puppet.yaml
  8. 8
      deployment/ceilometer/ceilometer-agent-compute-container-puppet.yaml
  9. 8
      deployment/ceilometer/ceilometer-agent-ipmi-container-puppet.yaml
  10. 8
      deployment/ceilometer/ceilometer-agent-notification-container-puppet.yaml
  11. 20
      deployment/ceph-ansible/ceph-base.yaml
  12. 8
      deployment/cinder/cinder-api-container-puppet.yaml
  13. 8
      deployment/cinder/cinder-backup-container-puppet.yaml
  14. 18
      deployment/cinder/cinder-backup-pacemaker-puppet.yaml
  15. 8
      deployment/cinder/cinder-scheduler-container-puppet.yaml
  16. 8
      deployment/cinder/cinder-volume-container-puppet.yaml
  17. 18
      deployment/cinder/cinder-volume-pacemaker-puppet.yaml
  18. 10
      deployment/database/mysql-container-puppet.yaml
  19. 20
      deployment/database/mysql-pacemaker-puppet.yaml
  20. 8
      deployment/database/redis-container-puppet.yaml
  21. 14
      deployment/database/redis-pacemaker-puppet.yaml
  22. 8
      deployment/deprecated/logging/fluentd-container-puppet.yaml
  23. 8
      deployment/deprecated/monitoring/sensu-client-container-puppet.yaml
  24. 10
      deployment/deprecated/nova/nova-consoleauth-container-puppet.yaml
  25. 8
      deployment/deprecated/opendaylight/opendaylight-api-container-puppet.yaml
  26. 8
      deployment/deprecated/panko/panko-api-container-puppet.yaml
  27. 8
      deployment/ec2/ec2-api-container-puppet.yaml
  28. 8
      deployment/etcd/etcd-container-puppet.yaml
  29. 8
      deployment/experimental/designate/designate-api-container-puppet.yaml
  30. 8
      deployment/experimental/designate/designate-central-container-puppet.yaml
  31. 8
      deployment/experimental/designate/designate-mdns-container-puppet.yaml
  32. 8
      deployment/experimental/designate/designate-producer-container-puppet.yaml
  33. 8
      deployment/experimental/designate/designate-sink-container-puppet.yaml
  34. 12
      deployment/experimental/designate/designate-worker-container-puppet.yaml
  35. 8
      deployment/glance/glance-api-container-puppet.yaml
  36. 4
      deployment/glance/glance-api-logging-file-container.yaml
  37. 8
      deployment/gnocchi/gnocchi-api-container-puppet.yaml
  38. 8
      deployment/gnocchi/gnocchi-metricd-container-puppet.yaml
  39. 8
      deployment/gnocchi/gnocchi-statsd-container-puppet.yaml
  40. 8
      deployment/haproxy/haproxy-container-puppet.yaml
  41. 18
      deployment/haproxy/haproxy-pacemaker-puppet.yaml
  42. 8
      deployment/heat/heat-api-cfn-container-puppet.yaml
  43. 10
      deployment/heat/heat-api-container-puppet.yaml
  44. 8
      deployment/heat/heat-engine-container-puppet.yaml
  45. 8
      deployment/horizon/horizon-container-puppet.yaml
  46. 8
      deployment/ironic/ironic-api-container-puppet.yaml
  47. 8
      deployment/ironic/ironic-conductor-container-puppet.yaml
  48. 8
      deployment/ironic/ironic-inspector-container-puppet.yaml
  49. 8
      deployment/ironic/ironic-neutron-agent-container-puppet.yaml
  50. 8
      deployment/ironic/ironic-pxe-container-puppet.yaml
  51. 8
      deployment/iscsid/iscsid-container-puppet.yaml
  52. 8
      deployment/keepalived/keepalived-container-puppet.yaml
  53. 8
      deployment/keystone/keystone-container-puppet.yaml
  54. 4
      deployment/logging/files/barbican-api.yaml
  55. 4
      deployment/logging/files/heat-engine.yaml
  56. 4
      deployment/logging/files/keystone.yaml
  57. 4
      deployment/logging/files/neutron-api.yaml
  58. 4
      deployment/logging/files/nova-api.yaml
  59. 4
      deployment/logging/files/nova-common.yaml
  60. 4
      deployment/logging/files/nova-metadata.yaml
  61. 4
      deployment/logging/files/panko-api.yaml
  62. 4
      deployment/logging/files/placement-api.yaml
  63. 4
      deployment/logging/rsyslog-sidecar-container-puppet.yaml
  64. 8
      deployment/logging/stdout/barbican-api.yaml
  65. 4
      deployment/logging/stdout/haproxy.yaml
  66. 8
      deployment/logging/stdout/heat-api-cfn.yaml
  67. 8
      deployment/logging/stdout/heat-api.yaml
  68. 8
      deployment/logging/stdout/keystone.yaml
  69. 8
      deployment/logging/stdout/nova-api.yaml
  70. 2
      deployment/logging/stdout/nova-common.yaml
  71. 8
      deployment/logging/stdout/nova-metadata.yaml
  72. 8
      deployment/logging/stdout/panko-api.yaml
  73. 8
      deployment/logging/stdout/placement-api.yaml
  74. 8
      deployment/logrotate/logrotate-crond-container-puppet.yaml
  75. 8
      deployment/manila/manila-api-container-puppet.yaml
  76. 8
      deployment/manila/manila-scheduler-container-puppet.yaml
  77. 8
      deployment/manila/manila-share-container-puppet.yaml
  78. 18
      deployment/manila/manila-share-pacemaker-puppet.yaml
  79. 8
      deployment/memcached/memcached-container-puppet.yaml
  80. 8
      deployment/messaging/rpc-qdrouterd-container-puppet.yaml
  81. 8
      deployment/metrics/collectd-container-puppet.yaml
  82. 8
      deployment/metrics/qdr-container-puppet.yaml
  83. 8
      deployment/mistral/mistral-api-container-puppet.yaml
  84. 8
      deployment/mistral/mistral-engine-container-puppet.yaml
  85. 8
      deployment/mistral/mistral-event-engine-container-puppet.yaml
  86. 8
      deployment/mistral/mistral-executor-container-puppet.yaml
  87. 8
      deployment/multipathd/multipathd-container.yaml
  88. 8
      deployment/neutron/neutron-api-container-puppet.yaml
  89. 4
      deployment/neutron/neutron-bgpvpn-api-container-puppet.yaml
  90. 14
      deployment/neutron/neutron-dhcp-container-puppet.yaml
  91. 4
      deployment/neutron/neutron-l2gw-api-container-puppet.yaml
  92. 18
      deployment/neutron/neutron-l3-container-puppet.yaml
  93. 8
      deployment/neutron/neutron-metadata-container-puppet.yaml
  94. 10
      deployment/neutron/neutron-ovs-agent-container-puppet.yaml
  95. 4
      deployment/neutron/neutron-ovs-dpdk-agent-container-puppet.yaml
  96. 4
      deployment/neutron/neutron-plugin-ml2-ansible-container-puppet.yaml
  97. 4
      deployment/neutron/neutron-plugin-ml2-cisco-vts-container-puppet.yaml
  98. 4
      deployment/neutron/neutron-plugin-ml2-container-puppet.yaml
  99. 4
      deployment/neutron/neutron-plugin-ml2-mlnx-sdn-assist-container-puppet.yaml
  100. 4
      deployment/neutron/neutron-plugin-nsx-container-puppet.yaml
  101. Some files were not shown because too many files have changed in this diff Show More

@ -4,10 +4,10 @@ description: >
OpenStack containerized aodh service
parameters:
DockerAodhApiImage:
ContainerAodhApiImage:
description: image
type: string
DockerAodhConfigImage:
ContainerAodhConfigImage:
description: The container image to use for the aodh config_volume
type: string
EndpointMap:
@ -142,7 +142,7 @@ outputs:
- "\n"
- - "include tripleo::profile::base::aodh::api"
- {get_attr: [MySQLClient, role_data, step_config]}
config_image: {get_param: DockerAodhConfigImage}
config_image: {get_param: ContainerAodhConfigImage}
kolla_config:
/var/lib/kolla/config_files/aodh_api.json:
command: /usr/sbin/httpd -DFOREGROUND
@ -163,7 +163,7 @@ outputs:
# db sync runs before permissions set by kolla_config
step_2:
aodh_init_log:
image: &aodh_api_image {get_param: DockerAodhApiImage}
image: &aodh_api_image {get_param: ContainerAodhApiImage}
net: none
user: root
volumes:

@ -4,10 +4,10 @@ description: >
OpenStack containerized Aodh Evaluator service
parameters:
DockerAodhEvaluatorImage:
ContainerAodhEvaluatorImage:
description: image
type: string
DockerAodhConfigImage:
ContainerAodhConfigImage:
description: The container image to use for the aodh config_volume
type: string
EndpointMap:
@ -76,7 +76,7 @@ outputs:
- "\n"
- - "include tripleo::profile::base::aodh::evaluator"
- {get_attr: [MySQLClient, role_data, step_config]}
config_image: {get_param: DockerAodhConfigImage}
config_image: {get_param: ContainerAodhConfigImage}
kolla_config:
/var/lib/kolla/config_files/aodh_evaluator.json:
command: /usr/bin/aodh-evaluator
@ -92,7 +92,7 @@ outputs:
docker_config:
step_4:
aodh_evaluator:
image: {get_param: DockerAodhEvaluatorImage}
image: {get_param: ContainerAodhEvaluatorImage}
net: host
privileged: false
restart: always

@ -4,10 +4,10 @@ description: >
OpenStack containerized Aodh Listener service
parameters:
DockerAodhListenerImage:
ContainerAodhListenerImage:
description: image
type: string
DockerAodhConfigImage:
ContainerAodhConfigImage:
description: The container image to use for the aodh config_volume
type: string
EndpointMap:
@ -77,7 +77,7 @@ outputs:
- "\n"
- - "include tripleo::profile::base::aodh::listener"
- {get_attr: [MySQLClient, role_data, step_config]}
config_image: {get_param: DockerAodhConfigImage}
config_image: {get_param: ContainerAodhConfigImage}
kolla_config:
/var/lib/kolla/config_files/aodh_listener.json:
command: /usr/bin/aodh-listener
@ -93,7 +93,7 @@ outputs:
docker_config:
step_4:
aodh_listener:
image: {get_param: DockerAodhListenerImage}
image: {get_param: ContainerAodhListenerImage}
net: host
privileged: false
restart: always

@ -4,10 +4,10 @@ description: >
OpenStack containerized Aodh Notifier service
parameters:
DockerAodhNotifierImage:
ContainerAodhNotifierImage:
description: image
type: string
DockerAodhConfigImage:
ContainerAodhConfigImage:
description: The container image to use for the aodh config_volume
type: string
EndpointMap:
@ -77,7 +77,7 @@ outputs:
- "\n"
- - "include tripleo::profile::base::aodh::notifier"
- {get_attr: [MySQLClient, role_data, step_config]}
config_image: {get_param: DockerAodhConfigImage}
config_image: {get_param: ContainerAodhConfigImage}
kolla_config:
/var/lib/kolla/config_files/aodh_notifier.json:
command: /usr/bin/aodh-notifier
@ -93,7 +93,7 @@ outputs:
docker_config:
step_4:
aodh_notifier:
image: {get_param: DockerAodhNotifierImage}
image: {get_param: ContainerAodhNotifierImage}
net: host
privileged: false
restart: always

@ -4,16 +4,16 @@ description: >
OpenStack containerized Barbican API service
parameters:
DockerBarbicanApiImage:
ContainerBarbicanApiImage:
description: image
type: string
DockerBarbicanConfigImage:
ContainerBarbicanConfigImage:
description: The container image to use for the barbican config_volume
type: string
DockerBarbicanKeystoneListenerImage:
ContainerBarbicanKeystoneListenerImage:
description: image
type: string
DockerBarbicanWorkerImage:
ContainerBarbicanWorkerImage:
description: image
type: string
EndpointMap:
@ -281,7 +281,7 @@ outputs:
- "\n"
- - "include ::tripleo::profile::base::barbican::api"
- {get_attr: [MySQLClient, role_data, step_config]}
config_image: {get_param: DockerBarbicanConfigImage}
config_image: {get_param: ContainerBarbicanConfigImage}
kolla_config:
/var/lib/kolla/config_files/barbican_api.json:
command: /usr/sbin/httpd -DFOREGROUND
@ -432,7 +432,7 @@ outputs:
- if:
- atos_hsm_enabled
- barbican_init_atos_directory:
image: &barbican_api_image {get_param: DockerBarbicanApiImage}
image: &barbican_api_image {get_param: ContainerBarbicanApiImage}
user: root
volumes:
- /etc/proteccio:/etc/proteccio
@ -681,7 +681,7 @@ outputs:
- KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
- barbican_keystone_listener:
start_order: 6
image: {get_param: DockerBarbicanKeystoneListenerImage}
image: {get_param: ContainerBarbicanKeystoneListenerImage}
net: host
privileged: false
restart: always
@ -697,7 +697,7 @@ outputs:
environment: *kolla_env
- barbican_worker:
start_order: 7
image: {get_param: DockerBarbicanWorkerImage}
image: {get_param: ContainerBarbicanWorkerImage}
net: host
privileged: false
restart: always

@ -3,10 +3,10 @@ heat_template_version: rocky
description: >
OpenStack containerized Liquidio compute service
parameters:
DockerLiquidioImage:
ContainerLiquidioImage:
description: The container image to use for the Liquidio Service
type: string
DockerLiquidioConfigImage:
ContainerLiquidioConfigImage:
description: The container image to use for the Liquidio config generation
type: string
EndpointMap:
@ -88,7 +88,7 @@ outputs:
puppet_tags: liquidio_config
step_config: |
include ::tripleo::host::liquidio::compute
config_image: {get_param: DockerLiquidioConfigImage}
config_image: {get_param: ContainerLiquidioConfigImage}
kolla_config:
/var/lib/kolla/config_files/liquidio_config.json:
command: "/usr/bin/liquidio-compute start"
@ -105,7 +105,7 @@ outputs:
step_5:
liquidio_compute_service:
start_order: 10
image: {get_param: DockerLiquidioImage}
image: {get_param: ContainerLiquidioImage}
net: host
detach: true
user: root

@ -4,10 +4,10 @@ description: >
OpenStack containerized Ceilometer Agent Central service
parameters:
DockerCeilometerCentralImage:
ContainerCeilometerCentralImage:
description: image
type: string
DockerCeilometerConfigImage:
ContainerCeilometerConfigImage:
description: The container image to use for the ceilometer config_volume
type: string
CeilometerAgentCentralLoggingSource:
@ -89,7 +89,7 @@ outputs:
puppet_tags: ceilometer_config
step_config: |
include ::tripleo::profile::base::ceilometer::agent::polling
config_image: {get_param: DockerCeilometerConfigImage}
config_image: {get_param: ContainerCeilometerConfigImage}
kolla_config:
/var/lib/kolla/config_files/ceilometer_agent_central.json:
command: /usr/bin/ceilometer-polling --polling-namespaces central --logfile /var/log/ceilometer/central.log
@ -102,7 +102,7 @@ outputs:
step_3:
ceilometer_init_log:
start_order: 0
image: &ceilometer_agent_central_image {get_param: DockerCeilometerCentralImage}
image: &ceilometer_agent_central_image {get_param: ContainerCeilometerCentralImage}
net: none
user: root
command: ['/bin/bash', '-c', 'chown -R ceilometer:ceilometer /var/log/ceilometer']

@ -4,10 +4,10 @@ description: >
OpenStack containerized Ceilometer Agent Compute service
parameters:
DockerCeilometerComputeImage:
ContainerCeilometerComputeImage:
description: image
type: string
DockerCeilometerConfigImage:
ContainerCeilometerConfigImage:
description: The container image to use for the ceilometer config_volume
type: string
EndpointMap:
@ -85,7 +85,7 @@ outputs:
puppet_tags: ceilometer_config
step_config:
include ::tripleo::profile::base::ceilometer::agent::polling
config_image: {get_param: DockerCeilometerConfigImage}
config_image: {get_param: ContainerCeilometerConfigImage}
kolla_config:
/var/lib/kolla/config_files/ceilometer_agent_compute.json:
command: /usr/bin/ceilometer-polling --polling-namespaces compute --logfile /var/log/ceilometer/compute.log
@ -97,7 +97,7 @@ outputs:
docker_config:
step_4:
ceilometer_agent_compute:
image: {get_param: DockerCeilometerComputeImage}
image: {get_param: ContainerCeilometerComputeImage}
net: host
privileged: false
restart: always

@ -4,10 +4,10 @@ description: >
OpenStack containerized Ceilometer Agent Ipmi service
parameters:
DockerCeilometerIpmiImage:
ContainerCeilometerIpmiImage:
description: image
type: string
DockerCeilometerConfigImage:
ContainerCeilometerConfigImage:
description: The container image to use for the ceilometer config_volume
type: string
CeilometerAgentIpmiLoggingSource:
@ -97,7 +97,7 @@ outputs:
puppet_tags: ceilometer_config
step_config: |
include ::tripleo::profile::base::ceilometer::agent::polling
config_image: {get_param: DockerCeilometerConfigImage}
config_image: {get_param: ContainerCeilometerConfigImage}
kolla_config:
/var/lib/kolla/config_files/ceilometer-agent-ipmi.json:
command: /usr/bin/ceilometer-polling --polling-namespaces ipmi
@ -110,7 +110,7 @@ outputs:
step_3:
ceilometer_init_log:
start_order: 0
image: &ceilometer_agent_ipmi_image {get_param: DockerCeilometerIpmiImage}
image: &ceilometer_agent_ipmi_image {get_param: ContainerCeilometerIpmiImage}
net: none
user: root
command: ['/bin/bash', '-c', 'chown -R ceilometer:ceilometer /var/log/ceilometer']

@ -4,10 +4,10 @@ description: >
OpenStack containerized Ceilometer Agent Notification service
parameters:
DockerCeilometerNotificationImage:
ContainerCeilometerNotificationImage:
description: image
type: string
DockerCeilometerConfigImage:
ContainerCeilometerConfigImage:
description: The container image to use for the ceilometer config_volume
type: string
CeilometerAgentNotificationLoggingSource:
@ -89,7 +89,7 @@ outputs:
puppet_tags: ceilometer_config
step_config: |
include ::tripleo::profile::base::ceilometer::agent::notification
config_image: {get_param: DockerCeilometerConfigImage}
config_image: {get_param: ContainerCeilometerConfigImage}
kolla_config:
/var/lib/kolla/config_files/ceilometer_agent_notification.json:
command: /usr/bin/ceilometer-agent-notification --logfile /var/log/ceilometer/agent-notification.log
@ -113,7 +113,7 @@ outputs:
step_3:
ceilometer_init_log:
start_order: 0
image: &ceilometer_agent_notification_image {get_param: DockerCeilometerNotificationImage}
image: &ceilometer_agent_notification_image {get_param: ContainerCeilometerNotificationImage}
net: none
user: root
command: ['/bin/bash', '-c', 'chown -R ceilometer:ceilometer /var/log/ceilometer']

@ -156,7 +156,7 @@ parameters:
description: The password for the swift service account
type: string
hidden: true
DockerCephDaemonImage:
ContainerCephDaemonImage:
description: image
type: string
CephAnsiblePlaybookVerbosity:
@ -190,7 +190,7 @@ parameters:
conditions:
custom_registry_host:
yaql:
data: {get_param: DockerCephDaemonImage}
data: {get_param: ContainerCephDaemonImage}
expression: $.data.split('/')[0].matches('(\.|:)')
perform_upgrade:
equals: [{get_param: StackUpdateType}, 'UPGRADE']
@ -201,7 +201,7 @@ conditions:
- ''
resources:
DockerImageUrlParts:
ContainerImageUrlParts:
type: OS::Heat::Value
properties:
type: json
@ -211,21 +211,21 @@ resources:
- custom_registry_host
- yaql:
expression: let(location => $.data.rightSplit(':', 1)[0]) -> regex('(?:https?://)?(.*?)/(.*)').split($location)[1]
data: {get_param: DockerCephDaemonImage}
data: {get_param: ContainerCephDaemonImage}
- docker.io
image:
if:
- custom_registry_host
- yaql:
expression: let(location => $.data.rightSplit(':', 1)[0]) -> regex('(?:https?://)?(.*?)/(.*)').split($location)[2]
data: {get_param: DockerCephDaemonImage}
data: {get_param: ContainerCephDaemonImage}
- yaql:
expression: $.data.rightSplit(':', 1)[0]
data: {get_param: DockerCephDaemonImage}
data: {get_param: ContainerCephDaemonImage}
image_tag:
yaql:
expression: $.data.rightSplit(':', 1)[1]
data: {get_param: DockerCephDaemonImage}
data: {get_param: ContainerCephDaemonImage}
CephBaseAnsibleVars:
type: OS::Heat::Value
@ -236,9 +236,9 @@ resources:
fsid: { get_param: CephClusterFSID }
cluster: { get_param: CephClusterName }
docker: true
ceph_docker_registry: {get_attr: [DockerImageUrlParts, value, host]}
ceph_docker_image: {get_attr: [DockerImageUrlParts, value, image]}
ceph_docker_image_tag: {get_attr: [DockerImageUrlParts, value, image_tag]}
ceph_docker_registry: {get_attr: [ContainerImageUrlParts, value, host]}
ceph_docker_image: {get_attr: [ContainerImageUrlParts, value, image]}
ceph_docker_image_tag: {get_attr: [ContainerImageUrlParts, value, image_tag]}
containerized_deployment: true
public_network:
list_join:

@ -4,10 +4,10 @@ description: >
OpenStack containerized Cinder API service
parameters:
DockerCinderApiImage:
ContainerCinderApiImage:
description: image
type: string
DockerCinderConfigImage:
ContainerCinderConfigImage:
description: The container image to use for the cinder config_volume
type: string
CinderApiLoggingSource:
@ -215,7 +215,7 @@ outputs:
- "\n"
- - "include ::tripleo::profile::base::cinder::api"
- {get_attr: [MySQLClient, role_data, step_config]}
config_image: {get_param: DockerCinderConfigImage}
config_image: {get_param: ContainerCinderConfigImage}
kolla_config:
/var/lib/kolla/config_files/cinder_api.json:
command: /usr/sbin/httpd -DFOREGROUND
@ -246,7 +246,7 @@ outputs:
docker_config:
step_2:
cinder_api_init_logs:
image: &cinder_api_image {get_param: DockerCinderApiImage}
image: &cinder_api_image {get_param: ContainerCinderApiImage}
net: none
privileged: false
user: root

@ -4,10 +4,10 @@ description: >
OpenStack containerized Cinder Backup service
parameters:
DockerCinderBackupImage:
ContainerCinderBackupImage:
description: image
type: string
DockerCinderConfigImage:
ContainerCinderConfigImage:
description: The container image to use for the cinder config_volume
type: string
EndpointMap:
@ -150,7 +150,7 @@ outputs:
params:
DRIVER: {get_param: CinderBackupBackend}
- {get_attr: [MySQLClient, role_data, step_config]}
config_image: {get_param: DockerCinderConfigImage}
config_image: {get_param: ContainerCinderConfigImage}
kolla_config:
/var/lib/kolla/config_files/cinder_backup.json:
command: /usr/bin/cinder-backup --config-file /usr/share/cinder/cinder-dist.conf --config-file /etc/cinder/cinder.conf
@ -186,7 +186,7 @@ outputs:
step_3:
cinder_backup_init_logs:
start_order: 0
image: &cinder_backup_image {get_param: DockerCinderBackupImage}
image: &cinder_backup_image {get_param: ContainerCinderBackupImage}
net: none
privileged: false
user: root

@ -4,10 +4,10 @@ description: >
OpenStack containerized Cinder Backup service
parameters:
DockerCinderBackupImage:
ContainerCinderBackupImage:
description: image
type: string
DockerCinderConfigImage:
ContainerCinderConfigImage:
description: The container image to use for the cinder config_volume
type: string
CinderBackupBackend:
@ -115,7 +115,7 @@ outputs:
list_join:
- ':'
- - yaql:
data: {get_param: DockerCinderBackupImage}
data: {get_param: ContainerCinderBackupImage}
expression: $.data.rightSplit(separator => ":", maxSplits => 1)[0]
- 'pcmklatest'
tripleo::profile::pacemaker::cinder::backup_bundle::docker_volumes: {get_attr: [CinderCommon, cinder_backup_volumes]}
@ -140,7 +140,7 @@ outputs:
- "\n"
- - {get_attr: [CinderBackupBase, role_data, puppet_config, step_config]}
- "include ::tripleo::profile::pacemaker::cinder::backup"
config_image: {get_param: DockerCinderConfigImage}
config_image: {get_param: ContainerCinderConfigImage}
kolla_config:
/var/lib/kolla/config_files/cinder_backup.json:
command: /usr/bin/cinder-backup --config-file /usr/share/cinder/cinder-dist.conf --config-file /etc/cinder/cinder.conf
@ -169,7 +169,7 @@ outputs:
step_3:
cinder_backup_init_logs:
start_order: 0
image: {get_param: DockerCinderBackupImage}
image: {get_param: ContainerCinderBackupImage}
net: none
privileged: false
user: root
@ -194,7 +194,7 @@ outputs:
'if [ x"${TRIPLEO_MINOR_UPDATE,,}" != x"true" ] && /usr/sbin/pcs resource show openstack-cinder-backup; then /usr/sbin/pcs resource restart --wait=PCMKTIMEOUT openstack-cinder-backup; echo "openstack-cinder-backup restart invoked"; fi'
params:
PCMKTIMEOUT: {get_param: PcmkConfigRestartTimeout}
image: {get_param: DockerCinderBackupImage}
image: {get_param: ContainerCinderBackupImage}
volumes:
list_concat:
- {get_attr: [ContainersCommon, volumes]}
@ -217,7 +217,7 @@ outputs:
- puppet_debug_enabled
- - '--debug --verbose'
- - ''
image: {get_param: DockerCinderBackupImage}
image: {get_param: ContainerCinderBackupImage}
volumes:
list_concat:
- {get_attr: [ContainersCommon, container_puppet_apply_volumes]}
@ -236,7 +236,7 @@ outputs:
import_role:
name: tripleo-container-tag
vars:
container_image: {get_param: DockerCinderBackupImage}
container_image: {get_param: ContainerCinderBackupImage}
container_image_latest: *cinder_backup_image_pcmklatest
update_tasks:
- name: Cinder-Backup fetch and retag container image for pacemaker
@ -244,7 +244,7 @@ outputs:
block: &cinder_backup_fetch_retag_container_tasks
- name: Get docker Cinder-Backup image
set_fact:
docker_image: {get_param: DockerCinderBackupImage}
docker_image: {get_param: ContainerCinderBackupImage}
docker_image_latest: *cinder_backup_image_pcmklatest
- name: Get previous Cinder-Backup image id
shell: "{{container_cli}} images | awk '/cinder-backup.* pcmklatest/{print $3}' | uniq"

@ -4,10 +4,10 @@ description: >
OpenStack containerized Cinder Scheduler service
parameters:
DockerCinderSchedulerImage:
ContainerCinderSchedulerImage:
description: image
type: string
DockerCinderConfigImage:
ContainerCinderConfigImage:
description: The container image to use for the cinder config_volume
type: string
CinderSchedulerLoggingSource:
@ -91,7 +91,7 @@ outputs:
- - "include ::tripleo::profile::base::cinder::scheduler"
- - {get_attr: [CinderBase, role_data, step_config]}
- {get_attr: [MySQLClient, role_data, step_config]}
config_image: {get_param: DockerCinderConfigImage}
config_image: {get_param: ContainerCinderConfigImage}
kolla_config:
/var/lib/kolla/config_files/cinder_scheduler.json:
command: /usr/bin/cinder-scheduler --config-file /usr/share/cinder/cinder-dist.conf --config-file /etc/cinder/cinder.conf
@ -107,7 +107,7 @@ outputs:
docker_config:
step_2:
cinder_scheduler_init_logs:
image: &cinder_scheduler_image {get_param: DockerCinderSchedulerImage}
image: &cinder_scheduler_image {get_param: ContainerCinderSchedulerImage}
net: none
privileged: false
user: root

@ -4,10 +4,10 @@ description: >
OpenStack containerized Cinder Volume service
parameters:
DockerCinderVolumeImage:
ContainerCinderVolumeImage:
description: image
type: string
DockerCinderConfigImage:
ContainerCinderConfigImage:
description: The container image to use for the cinder config_volume
type: string
DockerCinderVolumeUlimit:
@ -275,7 +275,7 @@ outputs:
- - "include ::tripleo::profile::base::lvm"
- "include ::tripleo::profile::base::cinder::volume"
- get_attr: [MySQLClient, role_data, step_config]
config_image: {get_param: DockerCinderConfigImage}
config_image: {get_param: ContainerCinderConfigImage}
kolla_config:
/var/lib/kolla/config_files/cinder_volume.json:
command: /usr/bin/cinder-volume --config-file /usr/share/cinder/cinder-dist.conf --config-file /etc/cinder/cinder.conf
@ -308,7 +308,7 @@ outputs:
step_3:
cinder_volume_init_logs:
start_order: 0
image: &cinder_volume_image {get_param: DockerCinderVolumeImage}
image: &cinder_volume_image {get_param: ContainerCinderVolumeImage}
net: none
privileged: false
user: root

@ -4,10 +4,10 @@ description: >
OpenStack containerized Cinder Volume service
parameters:
DockerCinderVolumeImage:
ContainerCinderVolumeImage:
description: image
type: string
DockerCinderConfigImage:
ContainerCinderConfigImage:
description: The container image to use for the cinder config_volume
type: string
EndpointMap:
@ -101,7 +101,7 @@ outputs:
list_join:
- ':'
- - yaql:
data: {get_param: DockerCinderVolumeImage}
data: {get_param: ContainerCinderVolumeImage}
expression: $.data.rightSplit(separator => ":", maxSplits => 1)[0]
- 'pcmklatest'
tripleo::profile::pacemaker::cinder::volume_bundle::docker_volumes: {get_attr: [CinderCommon, cinder_volume_volumes]}
@ -128,7 +128,7 @@ outputs:
- - "include ::tripleo::profile::base::lvm"
- - "include ::tripleo::profile::pacemaker::cinder::volume"
- get_attr: [MySQLClient, role_data, step_config]
config_image: {get_param: DockerCinderConfigImage}
config_image: {get_param: ContainerCinderConfigImage}
kolla_config:
/var/lib/kolla/config_files/cinder_volume.json:
command: /usr/bin/cinder-volume --config-file /usr/share/cinder/cinder-dist.conf --config-file /etc/cinder/cinder.conf
@ -154,7 +154,7 @@ outputs:
step_3:
cinder_volume_init_logs:
start_order: 0
image: {get_param: DockerCinderVolumeImage}
image: {get_param: ContainerCinderVolumeImage}
net: none
privileged: false
user: root
@ -179,7 +179,7 @@ outputs:
'if [ x"${TRIPLEO_MINOR_UPDATE,,}" != x"true" ] && /usr/sbin/pcs resource show openstack-cinder-volume; then /usr/sbin/pcs resource restart --wait=PCMKTIMEOUT openstack-cinder-volume; echo "openstack-cinder-volume restart invoked"; fi'
params:
PCMKTIMEOUT: {get_param: PcmkConfigRestartTimeout}
image: {get_param: DockerCinderVolumeImage}
image: {get_param: ContainerCinderVolumeImage}
volumes:
list_concat:
- {get_attr: [ContainersCommon, volumes]}
@ -202,7 +202,7 @@ outputs:
- puppet_debug_enabled
- - '--debug --verbose'
- - ''
image: {get_param: DockerCinderVolumeImage}
image: {get_param: ContainerCinderVolumeImage}
volumes:
list_concat:
- {get_attr: [ContainersCommon, container_puppet_apply_volumes]}
@ -221,7 +221,7 @@ outputs:
import_role:
name: tripleo-container-tag
vars:
container_image: {get_param: DockerCinderVolumeImage}
container_image: {get_param: ContainerCinderVolumeImage}
container_image_latest: *cinder_volume_image_pcmklatest
update_tasks:
- name: Cinder-Volume fetch and retag container image for pacemaker
@ -229,7 +229,7 @@ outputs:
block: &cinder_volume_fetch_retag_container_tasks
- name: Get docker Cinder-Volume image
set_fact:
docker_image: {get_param: DockerCinderVolumeImage}
docker_image: {get_param: ContainerCinderVolumeImage}
docker_image_latest: *cinder_volume_image_pcmklatest
- name: Get previous Cinder-Volume image id
shell: "{{container_cli}} images | awk '/cinder-volume.* pcmklatest/{print $3}' | uniq"

@ -4,10 +4,10 @@ description: >
MySQL service deployment using puppet
parameters:
DockerMysqlImage:
ContainerMysqlImage:
description: image
type: string
DockerMysqlConfigImage:
ContainerMysqlConfigImage:
description: The container image to use for the mysql config_volume
type: string
EndpointMap:
@ -95,7 +95,7 @@ outputs:
- "\n"
- - "['Mysql_datadir', 'Mysql_user', 'Mysql_database', 'Mysql_grant', 'Mysql_plugin'].each |String $val| { noop_resource($val) }"
- {get_attr: [MysqlBase, role_data, step_config]}
config_image: &mysql_config_image {get_param: DockerMysqlConfigImage}
config_image: &mysql_config_image {get_param: ContainerMysqlConfigImage}
kolla_config:
/var/lib/kolla/config_files/mysql.json:
command: /usr/libexec/mysqld --user=mysql
@ -123,7 +123,7 @@ outputs:
# Kolla_bootstrap runs before permissions set by kolla_config
step_1:
mysql_init_logs:
image: &mysql_image {get_param: DockerMysqlImage}
image: &mysql_image {get_param: ContainerMysqlImage}
net: none
privileged: false
user: root
@ -286,7 +286,7 @@ outputs:
mysql_json: "{{ mysql_paunch_docker.stdout if mysql_paunch_docker.changed else mysql_paunch.stdout | from_json }}"
- name: Mysql container image after upgrade
set_fact:
post_upgrade_mysql_image: {get_param: DockerMysqlImage}
post_upgrade_mysql_image: {get_param: ContainerMysqlImage}
- name: Redo log clean-up script
set_fact:
# The purpose of this script is to start mysql so that it

@ -4,10 +4,10 @@ description: >
MySQL service deployment with pacemaker bundle
parameters:
DockerMysqlImage:
ContainerMysqlImage:
description: image
type: string
DockerMysqlConfigImage:
ContainerMysqlConfigImage:
description: The container image to use for the mysql config_volume
type: string
EndpointMap:
@ -130,7 +130,7 @@ outputs:
list_join:
- ':'
- - yaql:
data: {get_param: DockerMysqlImage}
data: {get_param: ContainerMysqlImage}
expression: $.data.rightSplit(separator => ":", maxSplits => 1)[0]
- 'pcmklatest'
tripleo::profile::pacemaker::database::mysql_bundle::control_port: 3123
@ -168,7 +168,7 @@ outputs:
- - "['Mysql_datadir', 'Mysql_user', 'Mysql_database', 'Mysql_grant', 'Mysql_plugin'].each |String $val| { noop_resource($val) }"
- "exec {'wait-for-settle': command => '/bin/true' }"
- "include ::tripleo::profile::pacemaker::database::mysql_bundle"
config_image: {get_param: DockerMysqlConfigImage}
config_image: {get_param: ContainerMysqlConfigImage}
kolla_config:
/var/lib/kolla/config_files/mysql.json:
command: /usr/sbin/pacemaker_remoted
@ -204,7 +204,7 @@ outputs:
mysql_data_ownership:
start_order: 0
detach: false
image: {get_param: DockerMysqlImage}
image: {get_param: ContainerMysqlImage}
net: host
user: root
# Kolla does only non-recursive chown
@ -214,7 +214,7 @@ outputs:
mysql_bootstrap:
start_order: 1
detach: false
image: {get_param: DockerMysqlImage}
image: {get_param: ContainerMysqlImage}
net: host
user: root
# Kolla bootstraps aren't idempotent, explicitly checking if bootstrap was done
@ -278,7 +278,7 @@ outputs:
'if [ x"${TRIPLEO_MINOR_UPDATE,,}" != x"true" ] && /usr/sbin/pcs resource show galera-bundle; then /usr/sbin/pcs resource restart --wait=PCMKTIMEOUT galera-bundle; echo "galera-bundle restart invoked"; fi'
params:
PCMKTIMEOUT: {get_param: PcmkConfigRestartTimeout}
image: {get_param: DockerMysqlImage}
image: {get_param: ContainerMysqlImage}
volumes:
list_concat:
- {get_attr: [ContainersCommon, volumes]}
@ -301,7 +301,7 @@ outputs:
- puppet_debug_enabled
- - '--debug'
- - ''
image: {get_param: DockerMysqlImage}
image: {get_param: ContainerMysqlImage}
volumes:
list_concat:
- {get_attr: [ContainersCommon, container_puppet_apply_volumes]}
@ -340,7 +340,7 @@ outputs:
import_role:
name: tripleo-container-tag
vars:
container_image: {get_param: DockerMysqlImage}
container_image: {get_param: ContainerMysqlImage}
container_image_latest: *mysql_image_pcmklatest
update_tasks:
- name: Mariadb fetch and retag container image for pacemaker
@ -348,7 +348,7 @@ outputs:
block: &mysql_fetch_retag_container_tasks
- name: Get docker Mariadb image
set_fact:
docker_image: {get_param: DockerMysqlImage}
docker_image: {get_param: ContainerMysqlImage}
docker_image_latest: *mysql_image_pcmklatest
- name: Get previous Mariadb image id
shell: "{{container_cli}} images | awk '/mariadb.* pcmklatest/{print $3}' | uniq"

@ -4,10 +4,10 @@ description: >
OpenStack containerized Redis services
parameters:
DockerRedisImage:
ContainerRedisImage:
description: image
type: string
DockerRedisConfigImage:
ContainerRedisConfigImage:
description: The container image to use for the redis config_volume
type: string
EndpointMap:
@ -127,7 +127,7 @@ outputs:
- "\n"
- - include ::tripleo::profile::base::database::redis
- {get_attr: [RedisBase, role_data, step_config]}
config_image: {get_param: DockerRedisConfigImage}
config_image: {get_param: ContainerRedisConfigImage}
kolla_config:
/var/lib/kolla/config_files/redis.json:
command: /usr/bin/redis-server /etc/redis.conf
@ -153,7 +153,7 @@ outputs:
- redis_init_logs:
start_order: 0
detach: false
image: &redis_image {get_param: DockerRedisImage}
image: &redis_image {get_param: ContainerRedisImage}
net: none
privileged: false
user: root

@ -4,10 +4,10 @@ description: >
OpenStack containerized Redis services
parameters:
DockerRedisImage:
ContainerRedisImage:
description: image
type: string
DockerRedisConfigImage:
ContainerRedisConfigImage:
description: The container image to use for the redis config_volume
type: string
EndpointMap:
@ -100,7 +100,7 @@ outputs:
list_join:
- ':'
- - yaql:
data: {get_param: DockerRedisImage}
data: {get_param: ContainerRedisImage}
expression: $.data.rightSplit(separator => ":", maxSplits => 1)[0]
- 'pcmklatest'
tripleo::profile::pacemaker::database::redis_bundle::control_port: 3124
@ -160,7 +160,7 @@ outputs:
puppet_tags: 'exec'
step_config: |
include ::tripleo::profile::pacemaker::database::redis_bundle
config_image: &redis_config_image {get_param: DockerRedisConfigImage}
config_image: &redis_config_image {get_param: ContainerRedisConfigImage}
kolla_config:
/var/lib/kolla/config_files/redis.json:
command: /usr/sbin/pacemaker_remoted
@ -226,7 +226,7 @@ outputs:
'if [ x"${TRIPLEO_MINOR_UPDATE,,}" != x"true" ] && /usr/sbin/pcs resource show redis-bundle; then /usr/sbin/pcs resource restart --wait=PCMKTIMEOUT redis-bundle; echo "redis-bundle restart invoked"; fi'
params:
PCMKTIMEOUT: {get_param: PcmkConfigRestartTimeout}
image: {get_param: DockerRedisConfigImage}
image: {get_param: ContainerRedisConfigImage}
volumes:
list_concat:
- {get_attr: [ContainersCommon, volumes]}
@ -312,7 +312,7 @@ outputs:
import_role:
name: tripleo-container-tag
vars:
container_image: {get_param: DockerRedisImage}
container_image: {get_param: ContainerRedisImage}
container_image_latest: *redis_image_pcmklatest
update_tasks:
- name: Redis fetch and retag container image for pacemaker
@ -320,7 +320,7 @@ outputs:
block: &redis_fetch_retag_container_tasks
- name: Get docker Redis image
set_fact:
docker_image: {get_param: DockerRedisImage}
docker_image: {get_param: ContainerRedisImage}
docker_image_latest: *redis_image_pcmklatest
- name: Get previous Redis image id
shell: "{{container_cli}} images | awk '/redis.* pcmklatest/{print $3}' | uniq"

@ -5,10 +5,10 @@ description: >
This service is deprecated and will be removed in future releases.
parameters:
DockerFluentdImage:
ContainerFluentdImage:
description: image
type: string
DockerFluentdConfigImage:
ContainerFluentdConfigImage:
description: The container image to use fluentd config_volume
type: string
EndpointMap:
@ -91,7 +91,7 @@ outputs:
puppet_tags: config
step_config: |
include ::tripleo::profile::base::logging::fluentd
config_image: {get_param: DockerFluentdConfigImage}
config_image: {get_param: ContainerFluentdConfigImage}
kolla_config:
/var/lib/kolla/config_files/fluentd.json:
command: /usr/bin/fluentd -c /etc/fluentd/fluent.conf -o /var/log/fluentd/fluentd.log
@ -110,7 +110,7 @@ outputs:
docker_config:
step_3:
fluentd:
image: {get_param: DockerFluentdImage}
image: {get_param: ContainerFluentdImage}
net: host
privileged: true
user: root

@ -5,10 +5,10 @@ description: >
This service is deprecated and will be remove in future releases.
parameters:
DockerSensuClientImage:
ContainerSensuClientImage:
description: image
type: string
DockerSensuConfigImage:
ContainerSensuConfigImage:
description: The container image to use for the sensu config_volume
type: string
EndpointMap:
@ -164,7 +164,7 @@ outputs:
config_volume: sensu
puppet_tags: sensu_rabbitmq_config,sensu_client_config,sensu_check_config,sensu_check
step_config: include ::tripleo::profile::base::monitoring::sensu
config_image: {get_param: DockerSensuConfigImage}
config_image: {get_param: ContainerSensuConfigImage}
kolla_config:
/var/lib/kolla/config_files/sensu-client.json:
command: /usr/bin/sensu-client -d /etc/sensu/conf.d/ -l /var/log/sensu/sensu-client.log
@ -180,7 +180,7 @@ outputs:
docker_config:
step_3:
sensu_client:
image: {get_param: DockerSensuClientImage}
image: {get_param: ContainerSensuClientImage}
net: host
privileged: true
# NOTE(mmagr) kolla image changes the user to 'sensu', we need it

@ -4,10 +4,10 @@ description: >
OpenStack containerized Nova Consoleauth service
parameters:
DockerNovaConsoleauthImage:
ContainerNovaConsoleauthImage:
description: image
type: string
DockerNovaConfigImage:
ContainerNovaConfigImage:
description: The container image to use for the nova config_volume
type: string
NovaConsoleauthLoggingSource:
@ -56,7 +56,7 @@ resources:
NovaLogging:
type: OS::TripleO::Services::Logging::NovaCommon
properties:
DockerNovaImage: {get_param: DockerNovaConsoleauthImage}
ContainerNovaImage: {get_param: ContainerNovaConsoleauthImage}
NovaServiceName: 'consoleauth'
NovaBase:
@ -96,7 +96,7 @@ outputs:
- "\n"
- - include tripleo::profile::base::nova::consoleauth
- {get_attr: [MySQLClient, role_data, step_config]}
config_image: {get_param: DockerNovaConfigImage}
config_image: {get_param: ContainerNovaConfigImage}
kolla_config:
/var/lib/kolla/config_files/nova_consoleauth.json:
command:
@ -116,7 +116,7 @@ outputs:
docker_config:
step_4:
nova_consoleauth:
image: {get_param: DockerNovaConsoleauthImage}
image: {get_param: ContainerNovaConsoleauthImage}
net: host
privileged: false
restart: always

@ -6,10 +6,10 @@ description: >
be disabled in future releases.
parameters:
DockerOpendaylightApiImage:
ContainerOpendaylightApiImage:
description: image
type: string
DockerOpendaylightConfigImage:
ContainerOpendaylightConfigImage:
description: image
type: string
EndpointMap:
@ -193,7 +193,7 @@ outputs:
puppet_tags: odl_user,odl_keystore
step_config: |
include tripleo::profile::base::neutron::opendaylight
config_image: {get_param: DockerOpendaylightConfigImage}
config_image: {get_param: ContainerOpendaylightConfigImage}
kolla_config:
/var/lib/kolla/config_files/opendaylight_api.json:
command: /opt/opendaylight/bin/karaf server
@ -210,7 +210,7 @@ outputs:
step_1:
opendaylight_api:
start_order: 0
image: &odl_api_image {get_param: DockerOpendaylightApiImage}
image: &odl_api_image {get_param: ContainerOpendaylightApiImage}
privileged: false
net: host
detach: true

@ -6,10 +6,10 @@ description: >
will be disabled in future releases.
parameters:
DockerPankoApiImage:
ContainerPankoApiImage:
description: image
type: string
DockerPankoConfigImage: