openstack/tripleo-heat-templates
Code Issues Proposed changes

Merge "Convert Docker*Image parameters"

Browse Source
This commit is contained in:
Zuul
2019-06-18 08:01:14 +00:00
committed by Gerrit Code Review
parent 52dc46180a a68151d02a
commit 14998e6a5d
143 changed files with 650 additions and 651 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
deployment/nova/nova-metadata-container-puppet.yaml
View File

@@ -4,10 +4,10 @@ description: >
OpenStack containerized Nova Metadata service
parameters:
DockerNovaMetadataImage:
ContainerNovaMetadataImage:
description: image
type: string
DockerNovaMetadataConfigImage:
ContainerNovaMetadataConfigImage:
description: The container image to use for the nova config_volume
type: string
NovaMetadataLoggingSource:
@@ -205,7 +205,7 @@ outputs:
- "\n"
- - include tripleo::profile::base::nova::metadata
- {get_attr: [MySQLClient, role_data, step_config]}
config_image: {get_param: DockerNovaMetadataConfigImage}
config_image: {get_param: ContainerNovaMetadataConfigImage}
kolla_config:
/var/lib/kolla/config_files/nova_metadata.json:
command: /usr/sbin/httpd -DFOREGROUND
@@ -228,7 +228,7 @@ outputs:
step_4:
nova_metadata:
start_order: 2
image: {get_param: DockerNovaMetadataImage}
image: {get_param: ContainerNovaMetadataImage}
net: host
user: root
restart: always