Wire in net_config_override in undercloud.conf for containerized undercloud heat installer

[Bogdan Dobrelya]

Looking onto that 'net_config_override = net-config-override.json' thing http://codesearch.openstack.org/?q=net_config_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://codesearch.openstack.org/?q=undercloud_resource_registry_args&i=nope&files=&repos= ?

When undercloud_net_config_override is defined in quickstart,
it should only set net_config_override in undercloud.conf and omit generating undercloud-parameter-defaults.yaml.j2 from undercloud_resource_registry_args and undercloud_network_environment_args. Otherwise, the generated undercloud-parameter-defaults.yaml should be set in undercloud.conf's net_config_override instead.

From the client side, net_config_override needs to be wired in and processed, when it is a template file, with a given context, like instack does/did.

This improves upgrades UX when there had been custom net config used for the original instack deployment, which needs to be upgraded into containerized undercloud w/o manual steps, like translating that original net config into something consumable and working well in t-h-t.

[Bogdan Dobrelya (bogdando)]

Let me clarify, the context is the containerized undercloud, the bug will only affect the future instack to containerized UC regression check job, that verifies undercloud.conf against regressions after upgrades from instack to heat installer for undercloud:

3:53:44 PM GMT+2 - bogdando: we have a 2 interfaces to generate net config for UC
3:54:11 PM GMT+2 - bogdando: the one, based on instack net_config_override should be wired back in
3:54:27 PM GMT+2 - bogdando: the 2nd may be kept or removed
3:54:48 PM GMT+2 - bogdando: but I hope to see it there, it repeats the approach we have for overcloud net config
3:55:14 PM GMT+2 - bogdando: we have no such a job yet

[OpenStack Infra (hudson-openstack)]

Fix proposed to branch: master
Review: https://review.openstack.org/563610

[OpenStack Infra (hudson-openstack)]

Fix proposed to branch: master
Review: https://review.openstack.org/563636

[Bogdan Dobrelya (bogdando)]

Related change https://review.openstack.org/#/c/564231

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/563610
Committed: https://git.openstack.org/cgit/openstack/python-tripleoclient/commit/?id=416b27ddbd005adff8f3124aa44e229eb78f50cf
Submitter: Zuul
Branch: master

commit 416b27ddbd005adff8f3124aa44e229eb78f50cf
Author: Bogdan Dobrelya <email address hidden>
Date: Mon Apr 23 14:39:47 2018 +0200

    Wire-in net_config_override

    Allow to override network configs and maintain parity
    with instack.

    net_config_override takes higher data precedence over
    custom_env_files and t-h-t UndercloudNetConfigOverride.

    Instack templated j2 tags are allowed to be used as well,
    which smooths upgrading paths from instack. Known instack_env
    to heat params or config opts mappings provide the context for
    legacy instack templates processing.

    Partial-bug: #1763337

    Change-Id: I3b59abc839ec6c709e5fd24652610a5fac58ee57
    Signed-off-by: Bogdan Dobrelya <email address hidden>

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/563636
Committed: https://git.openstack.org/cgit/openstack/tripleo-quickstart-extras/commit/?id=c3fd5257e5d0aee7acd2526ee3c6e3a1de9c4408
Submitter: Zuul
Branch: master

commit c3fd5257e5d0aee7acd2526ee3c6e3a1de9c4408
Author: Bogdan Dobrelya <email address hidden>
Date: Mon Apr 23 14:55:28 2018 +0200

    Align UC net/env-files override with instack

    ...and tripleoclient.

    When installing via 'undercloud deploy', add
    environments/docker.yaml explicitly, as the client
    does for undercloud install --use-heat.

    Use undercloud_custom_env_files instead of
    undercloud_extra_services_args.

    Allow to override undercloud net config via a
    custom file defined from undercloud_net_config_override.

    Default t-h-t params file for net config are generated from
    undercloud_resource_registry_args and
    undercloud_network_environment_args and can be overriden via
    undercloud_net_config_override and/or undercloud_custom_env_files.

    This maintains feature parity of containerized UC heat
    installer with instack/undercloud.conf.

    Closes-bug: #1763337

    Depends-on: I3b59abc839ec6c709e5fd24652610a5fac58ee57
    Change-Id: Iaeca9ea014d99147461c6e3fae3122e27cb88c1d
    Signed-off-by: Bogdan Dobrelya <email address hidden>

[OpenStack Infra (hudson-openstack)]

This issue was fixed in the openstack/tripleo-quickstart-extras 2.1.1 release.