Looking onto that 'hieradata_override' thing http://codesearch.openstack.org/?q=hieradata_override&i=nope&files=&repos=, it seems we need to rework it in quickstart and implement instack parity for the client's heat installer as well. See http://git.openstack.org/cgit/openstack/tripleo-quickstart-extras/tree/roles/undercloud-deploy/templates/undercloud.conf.j2#n158
When undercloud_hieradata_override is defined in quickstart,
it should only set hieradata_override in undercloud.conf and omit generating hieradata-overrides-classic-undercloud.yaml.j2 / hieradata-overrides-t-h-t-undercloud.yaml.j2. Otherwise, the *single* generated file hieradata-overrides.yaml should be set in undercloud.conf's hieradata_override instead. This part to be addressed in https://bugs.launchpad.net/tripleo/+bug/1766848.
From the client side, hieradata_override needs to be wired in and processed as the following:
* When it is a heat env file, which is containing {parameter_defaults: {UndercloudExtraConfig
...}, just pass it in for t-h-t (undercloud deploy/upgrade), via -e arg.
* When it is an old-style instack hieradata formatted file, convert it into the t-h-t format,
which is containing {parameter_defaults: {UndercloudExtraConfig: <raw_data_as_is>} and do the
former as well.
This improves upgrades UX when there had been custom hiera data used for the original instack deployment, which needs to be upgraded into containerized undercloud. Though some revision will need to be done, like translating puppet hiera values into new data-schemes required for tht puppet configuration steps.
Fix proposed to branch: master
Review: https:/