Fix rabbitmq staged upgrade
Fix rabbitmq staged upgrade

Fix the short name overriding, and add long name (fqdn) overriding.

Change-Id: Ia152aed696be15119ba5b75177ef82bc786c4b05
Partial-Bug: #1832588

openstack/puppet-tripleo,openstack/puppet-tripleo,openstack/puppet-tripleo