Guard keygen and nova keypair upload by $RUN_ORC as well
Merge branch 'master' of github.com:agroup/instack-undercloud
This patch has merged and is included in the $LKG commit
Add a link to the review
Merge branch 'master' of github.com:agroup/instack-undercloud
Merge branch 'master' of github.com:agroup/instack-undercloud

Conflicts:
	scripts/instack-install-undercloud-source
Allow customization of RDO release to use on RHEL7

By removing rdo-release-icehouse from the undercloud source JSON
we can customize which version of RDO to use exporting RDO_RELEASE.

The cleanup script is also updated to remove any version of the
rdo-release package found.
Ensure we use rdo-icehouse if RDO_RELEASE is left unset
Merge pull request #35 from gfidente/rdo_release

Allow customization of RDO release to use on RHEL7
Remove keepalived custom policy on RHEL

The policy doesn't install on RHEL7. Removing it until a solution
is found.

https://bugzilla.redhat.com/show_bug.cgi?id=1151647
Merge pull request #51 from rwsu/keepalived-rhel

Remove keepalived custom policy on RHEL
Merge branch 'master' of github.com:agroup/instack-undercloud
Default $NODE_DIST to fedora as otherwise it is not defined
Update ironic-discoverd element for version 0.2.0
Move last changes from PR #32 to ironic-discoverd element
Make config files pick values ported from PR #32
Update commit sha for swift default ports cherry pick
Cherry picks that fail must fail the install

It is important that if cherry picks fail to apply cleanly the installation is
aborted. These aren't errors that we can ignore. If a patch fails to apply, it
should be fixed immediately. The current set actually leaves merge markers left
in the tripleo-image-elements due to a conflict. Instead of the install
continuing and trying to debug issues this will causer later on, the install
should fail and new commits should be pushed to correct/update the cherry
picks.
Add needed cherry pick for tuskar
Bring back into OVERCLOUD_PARAMETERS the *_FLAVOR customization vars