From: Jack Morgan <jack.morgan@intel.com>
Date: Thu, 14 Dec 2017 01:11:13 +0000 (+0000)
Subject: Merge "Updated fuel adapter (ODL)" into stable/euphrates
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=ff8457dedbdad4207557d9b9d91000a1b2990d34;p=pharos.git

Merge "Updated fuel adapter (ODL)" into stable/euphrates
---

ff8457dedbdad4207557d9b9d91000a1b2990d34
diff --cc config/installers/fuel/pod_config.yml.j2
index 04be321e,5406d76f..b412885f
--- a/config/installers/fuel/pod_config.yml.j2
+++ b/config/installers/fuel/pod_config.yml.j2
@@@ -11,12 -14,10 +14,10 @@@
      {%- set net_private = '10.1.0.0' -%}
      {%- set net_public = '172.30.10.0' -%}
      {%- set vlan_mgmt = '300' -%}
 -    {%- set vlan_private = '302' -%}
 +    {%- set vlan_private = '1000' -%}
  {%- endif -%}
  
- {%- if conf.net_config.public.dns is defined -%}
-     {%- set dns_public = conf['net_config']['public']['dns'] -%}
- {%- else -%}
+ {%- if dns_public is not defined -%}
      {%- set dns_public = [ '8.8.8.8', '8.8.4.4' ] -%}
  {%- endif -%}
  
@@@ -76,11 -78,11 +79,11 @@@ parameters
      opnfv_name_servers: {{ dns_public }}
      opnfv_dns_server01: '{{ dns_public[0] }}'
  
-     opnfv_net_mgmt_vlan: {{ conf['net_config']['mgmt']['vlan'] }}
-     opnfv_net_tenant_vlan: {{ conf['net_config']['private']['vlan'] }}
+     opnfv_net_mgmt_vlan: {{ vlan_mgmt }}
+     opnfv_net_tenant_vlan: {{ vlan_private }}
  
      opnfv_maas_node01_architecture: '{{ conf['nodes'][0]['node']['arch'] | dpkg_arch }}/generic'
 -    opnfv_maas_node01_power_address: {{ conf['nodes'][0]['remote_management']['address'] }}
 +    opnfv_maas_node01_power_address: {{ conf['nodes'][0]['remote_management']['address'].rsplit('/')[0]}}
      opnfv_maas_node01_power_type: {{ conf['nodes'][0]['remote_management']['type'] }}
      opnfv_maas_node01_power_user: {{ conf['nodes'][0]['remote_management']['user'] }}
      opnfv_maas_node01_power_password: {{ conf['nodes'][0]['remote_management']['pass'] }}