openstack/tripleo-quickstart-extras
Code Issues Proposed changes

[overcloud-deploy] Update deprecated references to Heat

Browse Source 
The references to Heat command are deprecated from Mitaka release and we should
now be using the OpenStack CLI instead.

Change-Id: Ib05e65b81c25ec695c59b9d443df69814728f67a
Signed-off-by: Gael Chamoulaud <gchamoul@redhat.com>
This commit is contained in:
Gael Chamoulaud 2016-12-09 15:35:54 +01:00
parent 31dd4b5756
commit 923bfe5e06
4 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
releasenotes/notes/Update_heat_deprecation_references-649da9a605fb40de.yaml Normal file
View File

@ -0,0 +1,5 @@
---
fixes:
- |
The references to the Heat command are deprecated from Mitaka release and
we should now be using the OpenStack CLI instead.

5
roles/overcloud-deploy/templates/overcloud-deploy-post.sh.j2
View File

@ -26,10 +26,11 @@ sudo sed -i '/^## BEGIN OVERCLOUD HOSTS/,/^## END OVERCLOUD HOSTS/ d' $HOSTFILE
cat <<EOF | sudo tee -a $HOSTFILE cat <<EOF | sudo tee -a $HOSTFILE
## BEGIN OVERCLOUD HOSTS #nodocs ## BEGIN OVERCLOUD HOSTS #nodocs
$(heat output-show -F raw overcloud HostsEntry) $(openstack stack output show overcloud HostsEntry -f value -c output_value)
{% if enable_pacemaker|bool and release == 'mitaka' %} {% if enable_pacemaker|bool and release == 'mitaka' %}
$(heat output-show -F raw overcloud PublicVip) overcloud-public-vip $(openstack stack output show overcloud PublicVip \
-f value -c output_value) overcloud-public-vip
{% endif %} {% endif %}
## END OVERCLOUD HOSTS #nodocs ## END OVERCLOUD HOSTS #nodocs
EOF EOF

6
roles/overcloud-deploy/templates/overcloud-deploy.sh.j2
View File

@ -69,15 +69,15 @@ openstack overcloud deploy \
### --stop_docs ### --stop_docs
# We don't always get a useful error code from the openstack deploy command, # We don't always get a useful error code from the openstack deploy command,
# so check `heat stack-list` for a CREATE_FAILED status. # so check `openstack stack list` for a CREATE_FAILED status.
if heat stack-list | grep -q 'CREATE_FAILED'; then if openstack stack list | grep -q 'CREATE_FAILED'; then
{%if release not in ['mitaka', 'liberty'] %} {%if release not in ['mitaka', 'liberty'] %}
# get the failures list # get the failures list
openstack stack failures list overcloud > failed_deployment_list.log || true openstack stack failures list overcloud > failed_deployment_list.log || true
{% endif %} {% endif %}
# get any puppet related errors # get any puppet related errors
for failed in $(heat resource-list \ for failed in $(openstack stack resource list \
--nested-depth 5 overcloud | grep FAILED | --nested-depth 5 overcloud | grep FAILED |
grep 'StructuredDeployment ' | cut -d '|' -f3) grep 'StructuredDeployment ' | cut -d '|' -f3)
do do

2
roles/overcloud-deploy/templates/overcloud-status.sh.j2
View File

@ -1,2 +1,2 @@
source $HOME/stackrc source $HOME/stackrc
heat resource-list -n5 overcloud | grep -v COMPLETE openstack stack resource list -n5 overcloud | grep -v COMPLETE