From 615ff5944fef945228bfdb758ee5366492562128 Mon Sep 17 00:00:00 2001 From: Bogdan Dobrelya Date: Fri, 13 Jul 2018 14:26:53 +0300 Subject: [PATCH] Fix network config conflicts for containerized UC Make net_config_override and undercloud_resource_registry_args mutually exclusive. When net_config_override is defined, we do not want resource_registry for the network config in tht, as they might happen to be in the direct conflict. Closes-bug: #1781577 Change-Id: I802b525d477fd29a2ad746256a342acb364b0d1d Signed-off-by: Bogdan Dobrelya --- roles/undercloud-deploy/README.md | 4 +++- roles/undercloud-deploy/tasks/create-scripts.yml | 5 +++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/roles/undercloud-deploy/README.md b/roles/undercloud-deploy/README.md index 426b59ec5..f96a54b71 100644 --- a/roles/undercloud-deploy/README.md +++ b/roles/undercloud-deploy/README.md @@ -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 TempURLs from OpenStack Object Storage (swift). - `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 setup with the default parameters for heat templates (parameter_defaults). - `undercloud_net_config_override`: -- a j2 template for os-net-config 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 ----------------------------- diff --git a/roles/undercloud-deploy/tasks/create-scripts.yml b/roles/undercloud-deploy/tasks/create-scripts.yml index 9d40fb216..6c57a443c 100644 --- a/roles/undercloud-deploy/tasks/create-scripts.yml +++ b/roles/undercloud-deploy/tasks/create-scripts.yml @@ -82,6 +82,11 @@ - overcloud_templates_path is defined 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. template: src: undercloud-parameter-defaults.yaml.j2