openstack.yaml and deployment priority fixes

Change-Id: I9852bb86f4f157a53f459690fe70e4e083f20f83