openstack/tripleo-quickstart-extras
Code Issues Proposed changes

Merge "Make deployed_server_prepare.sh compatible with newton"

Browse Source
This commit is contained in:
Jenkins
2017-08-26 19:28:21 +00:00
committed by Gerrit Code Review
parent 1427a63a5d cf1786d56b
commit aa404f8935
1 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
roles/overcloud-deploy/templates/deployed_server_prepare.sh.j2
View File

@@ -2,13 +2,23 @@
source ${HOME}/stackrc source ${HOME}/stackrc
# We did not have OVERCLOUD_ROLES var in the newton version of the
# get-occ-config script. Instead we need to use CONTROLLER_HOSTS var.
{% if release != "newton" %}
export OVERCLOUD_ROLES="" export OVERCLOUD_ROLES=""
{% for role in deployed_server_overcloud_roles %} {% for role in deployed_server_overcloud_roles %}
OVERCLOUD_ROLES="$OVERCLOUD_ROLES {{ role.name }}" OVERCLOUD_ROLES="$OVERCLOUD_ROLES {{ role.name }}"
export {{ role.name }}_hosts={{ role.hosts }} export {{ role.name }}_hosts={{ role.hosts }}
{% endfor %} {% endfor %}
export OVERCLOUD_HOSTS="{{ deployed_server_overcloud_roles|map(attribute='hosts')|join(' ') }}" export OVERCLOUD_HOSTS="{{ deployed_server_overcloud_roles|map(attribute='hosts')|join(' ') }}"
{% else %}
export CONTROLLER_HOSTS="{{deployed_server_overcloud_roles|map(attribute='hosts')|join(' ') }}"
{% endif %}
/usr/share/openstack-tripleo-heat-templates/deployed-server/scripts/get-occ-config.sh 2>&1 | sudo dd of=/var/log/deployed-server-os-collect-config.log /usr/share/openstack-tripleo-heat-templates/deployed-server/scripts/get-occ-config.sh 2>&1 | sudo dd of=/var/log/deployed-server-os-collect-config.log
# We also do not have the deployed-server-enable-ssh-admin script on newton.
{% if release != "newton" %}
/usr/share/openstack-tripleo-heat-templates/deployed-server/scripts/enable-ssh-admin.sh 2>&1 | sudo dd of=/var/log/deployed-server-enable-ssh-admin.log /usr/share/openstack-tripleo-heat-templates/deployed-server/scripts/enable-ssh-admin.sh 2>&1 | sudo dd of=/var/log/deployed-server-enable-ssh-admin.log
{% endif %}