Updated openstack/openstack
Project: openstack/python-novaclient  2005e17beddd0767ab874b8421a66a0b6d2487c5
null
Raise exception when poll returns error state

When running nova boot --poll, any error states that occur will be
seen but, an exit code of 0 will be returned indicating success.
This would be problematic for scripts looking to see if an
operation completed successfully.

To fix this, an exception is raised after the nova api indicates to the
poll code that the vm is in an error state. The exceptions signals the shell
main function to exit with code 1.

Change-Id: I48f6b1c82e2f8b221dda898dcb804b0196018505
Fixes-Bug: #1292669
Updated openstack/openstack
Project: openstack/heat  edd0a23cef8f34a8d0e21828489d1916ba55f7b3
null
Fix incorrect logic during updating in unittest

The property image_update_policy has two ways for initialization during
update. One of them is when image_update_policy is not presented in
prop_diff and shoud be used from self.properties. So image_update_policy
should be used in old and new templates without any changes.

Related-Bug: #1298850
Change-Id: Ie9afa65ad6d095d4293be077536fb807919de789