openstack/tripleo-heat-templates
Code Issues Proposed changes

Merge "Standardize path to prepare log file"

Browse Source
This commit is contained in:
Zuul 2018-10-25 19:10:07 +00:00 committed by Gerrit Code Review
commit 1fd31e4270
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
environments/undercloud.yaml
View File

@ -138,7 +138,6 @@ parameter_defaults:
UndercloudCtlplaneLocalSubnet: 'ctlplane-subnet' UndercloudCtlplaneLocalSubnet: 'ctlplane-subnet'
MistralDockerGroup: true MistralDockerGroup: true
PasswordAuthentication: 'yes' PasswordAuthentication: 'yes'
ContainerImagePrepareLogFile: ../install-undercloud.log
HeatEngineOptVolumes: HeatEngineOptVolumes:
- /usr/lib/heat:/usr/lib/heat:ro - /usr/lib/heat:/usr/lib/heat:ro
MySQLServerOptions: MySQLServerOptions:

6
puppet/services/container-image-prepare.j2.yaml
View File

@ -37,7 +37,7 @@ parameters:
the registry with images. the registry with images.
type: json type: json
ContainerImagePrepareLogFile: ContainerImagePrepareLogFile:
default: 'tripleo-container-image-prepare.log' default: '/var/log/tripleo-container-image-prepare.log'
type: string type: string
description: Used to store outputs of "openstack tripleo container image prepare". description: Used to store outputs of "openstack tripleo container image prepare".
DockerInsecureRegistryAddress: DockerInsecureRegistryAddress:
@ -105,8 +105,8 @@ outputs:
copy: copy:
dest: "{{ '{{' }} role_data.path {{ '}}' }}" dest: "{{ '{{' }} role_data.path {{ '}}' }}"
content: {{ roles }} content: {{ roles }}
- name: Run tripleo-container-image-prepare - name: Run tripleo-container-image-prepare logged to {{ '{{' }} log_file {{ '}}' }}
shell: sudo /usr/bin/tripleo-container-image-prepare --roles-file {{ '{{' }} role_data.path {{ '}}' }} --environment-file {{ '{{' }} prepare_param.path {{ '}}' }} --cleanup partial 2> {{ '{{' }} log_file {{ '}}' }} shell: sudo /usr/bin/tripleo-container-image-prepare --roles-file {{ '{{' }} role_data.path {{ '}}' }} --environment-file {{ '{{' }} prepare_param.path {{ '}}' }} --cleanup partial --log-file {{ '{{' }} log_file {{ '}}' }}
- name: Delete param file - name: Delete param file
file: file:
dest: "{{ '{{' }} prepare_param.path {{ '}}' }}" dest: "{{ '{{' }} prepare_param.path {{ '}}' }}"