Merge "Fix network config conflicts for containerized UC"
This commit is contained in:
commit
18d791527a
@ -130,11 +130,13 @@ may not be used. Enable this variable instead. Doing so changes the heat endpoin
|
|||||||
type from the default internal to public and changes the signaling method to use
|
type from the default internal to public and changes the signaling method to use
|
||||||
TempURLs from OpenStack Object Storage (swift).
|
TempURLs from OpenStack Object Storage (swift).
|
||||||
- `undercloud_resource_registry_args`: Sets up network config for Undercloud
|
- `undercloud_resource_registry_args`: Sets up network config for Undercloud
|
||||||
(resource_registry for heat templates). Defaults to Noop.
|
(resource_registry for heat templates). Defaults to Noop. Mutual exclusive
|
||||||
|
with ``undercloud_net_config_override``.
|
||||||
- `undercloud_network_environment_args`: Complements Undercloud networking
|
- `undercloud_network_environment_args`: Complements Undercloud networking
|
||||||
setup with the default parameters for heat templates (parameter_defaults).
|
setup with the default parameters for heat templates (parameter_defaults).
|
||||||
- `undercloud_net_config_override`: <null> -- a j2 template for os-net-config
|
- `undercloud_net_config_override`: <null> -- a j2 template for os-net-config
|
||||||
used to override network configuration. Accepts instack tags like LOCAL_IP et al.
|
used to override network configuration. Accepts instack tags like LOCAL_IP et al.
|
||||||
|
When it is defined, the ``undercloud_resource_registry_args`` value will be discarded.
|
||||||
|
|
||||||
Undercloud deployment methods
|
Undercloud deployment methods
|
||||||
-----------------------------
|
-----------------------------
|
||||||
|
@ -82,6 +82,11 @@
|
|||||||
- overcloud_templates_path is defined
|
- overcloud_templates_path is defined
|
||||||
static: no
|
static: no
|
||||||
|
|
||||||
|
- name: Noop resource_registry when using net_config_override
|
||||||
|
set_fact:
|
||||||
|
undercloud_resource_registry_args: {}
|
||||||
|
when: undercloud_net_config_override is defined
|
||||||
|
|
||||||
- name: Create the undercloud parameter defaults file.
|
- name: Create the undercloud parameter defaults file.
|
||||||
template:
|
template:
|
||||||
src: undercloud-parameter-defaults.yaml.j2
|
src: undercloud-parameter-defaults.yaml.j2
|
||||||
|
Loading…
Reference in New Issue
Block a user