openstack/tripleo-quickstart-extras
Code Issues Proposed changes

Add a full path for the -r option in prep-containers

Browse Source 
fs001 is failing prep-containers as roles_data_undercloud.yaml
is not found. This review adds the full path to the roles
file.

Closes-Bug: 1773406
Change-Id: I130fd1282506b0841a10d12a5b016ab6cb03730a
This commit is contained in:
Ronelle Landy 2018-05-25 12:23:02 -04:00 committed by Alex Schultz
parent 06f639228b
commit 5c01853b3d
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
roles/undercloud-deploy/defaults/main.yml
View File

@ -92,3 +92,5 @@ ctlplane_masquerade: false
update_containers: false
undercloud_enable_routed_networks: false
default_undercloud_roles_data_path: "{{ overcloud_templates_path }}/roles_data_undercloud.yaml"

2
roles/undercloud-deploy/templates/undercloud-prep-containers.sh.j2
View File

@ -64,7 +64,7 @@ openstack overcloud container image prepare \
{% endfor %}
-e {{ working_dir }}/undercloud-parameter-defaults.yaml \
{% endif %}
-r {{undercloud_roles_data|default('roles_data_undercloud.yaml')}} \
-r {{undercloud_roles_data|default(default_undercloud_roles_data_path)}} \
--namespace {{ undercloud_docker_registry_host }}{% if undercloud_docker_registry_port is defined %}:{{ undercloud_docker_registry_port }}{% endif%}/{{ undercloud_docker_registry_namespace }} \
--tag $BUILD_ID