From: Aric Gardner <agardner@linuxfoundation.org>
Date: Mon, 22 Jan 2018 16:13:11 +0000 (+0000)
Subject: Merge "[PDF] config: Add/update license headers"
X-Git-Tag: 6.0.0~28
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=091e127a21b7081cb805240ceb96f0fe3390608e;p=pharos.git

Merge "[PDF] config: Add/update license headers"
---

091e127a21b7081cb805240ceb96f0fe3390608e
diff --cc config/installers/fuel/pod_config.yml.j2
index 381e90f9,0b19eee3..74430961
--- a/config/installers/fuel/pod_config.yml.j2
+++ b/config/installers/fuel/pod_config.yml.j2
@@@ -1,18 -1,25 +1,25 @@@
+ ##############################################################################
+ # Copyright (c) 2018 Mirantis Inc., Enea AB and others.
+ # All rights reserved. This program and the accompanying materials
+ # are made available under the terms of the Apache License, Version 2.0
+ # which accompanies this distribution, and is available at
+ # http://www.apache.org/licenses/LICENSE-2.0
+ ##############################################################################
  ---
  {%- if conf.idf is defined and conf.idf.fuel is defined -%}
 -  {%- if conf.net_config is defined -%}
 -      {%- set net_admin = conf.net_config.admin.network -%}
 -      {%- set net_mgmt = conf.net_config.mgmt.network -%}
 -      {%- set net_private = conf.net_config.private.network -%}
 -      {%- set net_public = conf.net_config.public.network -%}
 -      {%- set vlan_mgmt = conf.net_config.mgmt.vlan -%}
 -      {%- set vlan_private = conf.net_config.private.vlan -%}
 -      {%- if conf.net_config.public.dns is defined -%}
 -          {%- set dns_public = conf.net_config.public.dns -%}
 +  {%- if conf.idf.net_config is defined -%}
 +      {%- set net_admin = conf.idf.net_config.admin.network -%}
 +      {%- set net_mgmt = conf.idf.net_config.mgmt.network -%}
 +      {%- set net_private = conf.idf.net_config.private.network -%}
 +      {%- set net_public = conf.idf.net_config.public.network -%}
 +      {%- set vlan_mgmt = conf.idf.net_config.mgmt.vlan -%}
 +      {%- set vlan_private = conf.idf.net_config.private.vlan -%}
 +      {%- if conf.idf.net_config.public.dns is defined -%}
 +          {%- set dns_public = conf.idf.net_config.public.dns -%}
        {%- endif -%}
 -      {%- set pxe_interface = conf.net_config.admin.interface -%}
 -      {%- if conf.net_config.public.gateway is defined -%}
 -          {%- set net_public_gw = conf.net_config.public.gateway -%}
 +      {%- set pxe_interface = conf.idf.net_config.admin.interface -%}
 +      {%- if conf.idf.net_config.public.gateway is defined -%}
 +          {%- set net_public_gw = conf.idf.net_config.public.gateway -%}
        {%- endif -%}
    {%- else -%}
        {%- set net_admin = '192.168.11.0' -%}