commit d18c6e92830bb7f6d8d62204747130678aa5a61c
Author: Martin Schuppert <email address hidden>
Date: Mon Jun 28 15:06:58 2021 +0200
Remove NovaVncProxyNetwork from ServiceNetMap
In Icef2481b65b41b524ad44eeecfbee4451006e1d2 we moved to use
NovaLibvirtNetwork as the single network to configure instance console
components.
Due to how hieradata is being rendered via tripleo-hieradata, the
removed NovaVncProxyNetwork resulted in no-vnc-proxy service to
fall back to the control plane network because NovaVncProxyNetwork
was removed.
NovaVncProxyNetwork was then reintroduced with
I595294956a4a7a0e2280c685ac1d2543edbc32f2 but as a side effect
again introduced the inconsistency on the console configuration.
This patch removes the NovaVncProxyNetwork from ServiceNetMap
but set it as part of service_net_map.j2.yaml and keep it in
sync with NovaLibvirtNetwork.
Reviewed: https:/ /review. opendev. org/c/openstack /tripleo- heat-templates/ +/798832 /opendev. org/openstack/ tripleo- heat-templates/ commit/ d18c6e92830bb7f 6d8d62204747130 678aa5a61c
Committed: https:/
Submitter: "Zuul (22348)"
Branch: stable/victoria
commit d18c6e92830bb7f 6d8d62204747130 678aa5a61c
Author: Martin Schuppert <email address hidden>
Date: Mon Jun 28 15:06:58 2021 +0200
Remove NovaVncProxyNetwork from ServiceNetMap
In Icef2481b65b41b 524ad44eeecfbee 4451006e1d2 we moved to use Network as the single network to configure instance console yNetwork was then reintroduced with 4a7a0e2280c685a c1d2543edbc32f2 but as a side effect
NovaLibvirt
components.
Due to how hieradata is being rendered via tripleo-hieradata, the
removed NovaVncProxyNetwork resulted in no-vnc-proxy service to
fall back to the control plane network because NovaVncProxyNetwork
was removed.
NovaVncProx
I595294956a
again introduced the inconsistency on the console configuration.
This patch removes the NovaVncProxyNetwork from ServiceNetMap net_map. j2.yaml and keep it in
but set it as part of service_
sync with NovaLibvirtNetwork.
Conflicts:
network/ service_ net_map. j2.yaml
overcloud- resource- registry- puppet. j2.yaml
Change-Id: I08fa1ee947574e 6fac24885b17706 a22054fcba9 42f52e13ac948da 1e57cf6906) c4e9c025c3deb9b 9e0a638d05)
Closes-Bug: #1917719
(cherry picked from commit 9da8a405952623e
(cherry picked from commit 2f0689d8d7e4078