From 9c3ecbb5238fa815e3f6b46c1933d69d588a5430 Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Mon, 29 Jan 2018 06:02:10 +0100 Subject: [virtual] Split 'pxebr' from 'mcpcontrol' net - add new virsh managed network 'pxebr' (to mimic baremetal behavior on virtual PODs, this will be the equivalent of PXE/admin network); - connect 'pxebr' to 3rd interface for cfg01, mas01 for all deploys (used to be baremetal-specific), replacing 'internal'; - keep 'mcpcontrol' connected only to 'cfg01' (+ 'mas01' if present) for initial infrastructure bring-up (1st interface); - switch all virtual cluster nodes to 'pxebr' (1st interface); - use 'pxebr' for all Salt cluster nodes traffic, 'mcpcontrol' only for mas01<=>cfg01 Salt traffic; - convert to jinja2 and expand it based on PDF instead of using `envsubst`; - split into two versions, one for each network used for Salt traffic; - ci/deploy.sh: Read scenario data before template parsing for cluster domain variable, needed in virsh network def; - leave docs diagram refresh to later after all possible deploy types have settled; - limit keyserver proxy usage to nodes where the configured http proxy matches the first nameserver (true for all MaaS-provisioned nodes), so we can re-use the same pillar for FN VMs and baremetal nodes; - add PXE/admin IP on cfg01's 3rd interface and switch other vnodes `salt_master_host` to point to it; JIRA: FUEL-322 Change-Id: Ie4f7aedddf2ef81046f1127b377d88dce79f0fda Signed-off-by: Alexandru Avadanii --- mcp/salt-formulas/opendaylight/server.sls | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'mcp/salt-formulas/opendaylight/server.sls') diff --git a/mcp/salt-formulas/opendaylight/server.sls b/mcp/salt-formulas/opendaylight/server.sls index f953cddc0..e70931301 100644 --- a/mcp/salt-formulas/opendaylight/server.sls +++ b/mcp/salt-formulas/opendaylight/server.sls @@ -15,10 +15,10 @@ opendaylight_repo_key: - name: "apt-key adv --keyserver keyserver.ubuntu.com --recv 44C05248" {%- if system.proxy is defined and system.proxy.keyserver is defined %} - env: -{%- if system.proxy.keyserver.http is defined %} +{%- if system.proxy.keyserver.http is defined and grains['dns']['nameservers'][0] in system.proxy.keyserver.http %} - http_proxy: {{ system.proxy.keyserver.http }} {%- endif %} -{%- if system.proxy.keyserver.https is defined %} +{%- if system.proxy.keyserver.https is defined and grains['dns']['nameservers'][0] in system.proxy.keyserver.https %} - https_proxy: {{ system.proxy.keyserver.https }} {%- endif %} {%- endif %} -- cgit 1.2.3-korg