openstack/tripleo-quickstart-extras
Code Issues Proposed changes

Merge "Don't overwrite tht_dir for upgrades to master"

Browse Source
This commit is contained in:
Jenkins 2017-05-15 10:30:57 +00:00 committed by Gerrit Code Review
commit 71bfc3a505
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
roles/overcloud-prep-config/templates/overcloud-custom-tht-script.sh.j2
View File

@ -28,6 +28,18 @@ pushd {{overcloud_templates_path}}
git fetch {{ overcloud_templates_repo }} {{ overcloud_templates_refspec }} && git checkout FETCH_HEAD git fetch {{ overcloud_templates_repo }} {{ overcloud_templates_refspec }} && git checkout FETCH_HEAD
popd popd
{% endif %} {% endif %}
{% if deploy_composable_scenario|bool %}
## * If desired composable scenario isn't present in the checked-out
## code, but is present in RPM, copy the scenario from RPM location.
## ::
if [ ! -e "{{ overcloud_templates_path }}/ci/environments/{{ composable_scenario }}" \
-a -e "/usr/share/openstack-tripleo-heat-templates/ci/environments/{{ composable_scenario }}" ]; then
cp "/usr/share/openstack-tripleo-heat-templates/ci/environments/{{ composable_scenario }}" \
"{{ overcloud_templates_path }}/ci/environments/{{ composable_scenario }}"
fi
{% endif %}
{% endif %} {% endif %}
{% if download_overcloud_templates_rpm is defined and overcloud_templates_path is defined %} {% if download_overcloud_templates_rpm is defined and overcloud_templates_path is defined %}

2
roles/overcloud-upgrade/tasks/create-scripts.yml
View File

@ -14,7 +14,7 @@
# Need to set fact here because tht_dir is used in the templated script # Need to set fact here because tht_dir is used in the templated script
# in "Create major overcloud upgrade script" task # in "Create major overcloud upgrade script" task
- name: set fact for tht_dir - name: set fact for tht_dir
when: target_upgrade_version in ['ocata', 'master'] when: target_upgrade_version in ['ocata']
set_fact: set_fact:
tht_dir: "/usr/share/openstack-tripleo-heat-templates" tht_dir: "/usr/share/openstack-tripleo-heat-templates"