X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=config%2Finstallers%2Ffuel%2Fpod_config.yml.j2;h=16d1c0f27a4ab4cd2de221842c241568d23539d5;hb=525c0041e84db5798854b116b7786cc79d4594be;hp=5406d76f1715999c956eb2c8b22384622d077060;hpb=c4b4629b59923e049500fc776b8a251d4cd4c3b9;p=pharos.git

diff --git a/config/installers/fuel/pod_config.yml.j2 b/config/installers/fuel/pod_config.yml.j2
index 5406d76f..16d1c0f2 100644
--- a/config/installers/fuel/pod_config.yml.j2
+++ b/config/installers/fuel/pod_config.yml.j2
@@ -8,19 +8,20 @@
     {%- if conf.net_config.public.dns is defined -%}
         {%- set dns_public = conf['net_config']['public']['dns'] -%}
     {%- endif -%}
+    {%- set pxe_interface = conf['net_config']['admin']['interface'] -%}
 {%- else -%}
     {%- set net_admin = '192.168.11.0' -%}
     {%- set net_mgmt = '172.16.10.0' -%}
     {%- 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' -%}
+    {%- set pxe_interface = 0 -%}
 {%- endif -%}
 
 {%- if dns_public is not defined -%}
     {%- set dns_public = [ '8.8.8.8', '8.8.4.4' ] -%}
 {%- endif -%}
-
 ---
 parameters:
   _param:
@@ -28,9 +29,6 @@ parameters:
     opnfv_infra_config_address: {{ net_mgmt | ipaddr_index('100') }}
     opnfv_infra_maas_node01_address: {{ net_mgmt | ipaddr_index('3') }}
     opnfv_infra_maas_node01_deploy_address: {{ net_admin | ipaddr_index('3') }}
-    opnfv_infra_compute_node01_address: {{ net_mgmt | ipaddr_index('141') }}
-    opnfv_infra_compute_node02_address: {{ net_mgmt | ipaddr_index('142') }}
-    opnfv_infra_compute_node03_address: {{ net_mgmt | ipaddr_index('143') }}
     opnfv_infra_kvm_address: {{ net_mgmt | ipaddr_index('140') }}
     opnfv_infra_kvm_node01_address: {{ net_mgmt | ipaddr_index('141') }}
     opnfv_infra_kvm_node02_address: {{ net_mgmt | ipaddr_index('142') }}
@@ -42,9 +40,9 @@ parameters:
     opnfv_openstack_gateway_node01_tenant_address: {{ net_private | ipaddr_index('6') }}
     opnfv_openstack_gateway_node02_tenant_address: {{ net_private | ipaddr_index('7') }}
     opnfv_openstack_gateway_node03_tenant_address: {{ net_private | ipaddr_index('9') }}
-    opnfv_openstack_proxy_address: {{ net_mgmt | ipaddr_index('80') }}
-    opnfv_openstack_proxy_node01_address: {{ net_mgmt | ipaddr_index('81') }}
-    opnfv_openstack_proxy_node02_address: {{ net_mgmt | ipaddr_index('82') }}
+    opnfv_openstack_proxy_address: {{ net_public | ipaddr_index('103') }}
+    opnfv_openstack_proxy_node01_address: {{ net_public | ipaddr_index('104') }}
+    opnfv_openstack_proxy_node02_address: {{ net_public | ipaddr_index('105') }}
     opnfv_openstack_control_address: {{ net_mgmt | ipaddr_index('10') }}
     opnfv_openstack_control_node01_address: {{ net_mgmt | ipaddr_index('11') }}
     opnfv_openstack_control_node02_address: {{ net_mgmt | ipaddr_index('12') }}
@@ -82,36 +80,36 @@ parameters:
     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'] }}
-    opnfv_maas_node01_interface_mac: '{{ conf['nodes'][0]['interfaces'][1] }}'
+    opnfv_maas_node01_interface_mac: '{{ conf['nodes'][0]['interfaces'][pxe_interface]['mac_address'] }}'
 
     opnfv_maas_node02_architecture: '{{ conf['nodes'][1]['node']['arch'] | dpkg_arch }}/generic'
-    opnfv_maas_node02_power_address: {{ conf['nodes'][1]['remote_management']['address'] }}
+    opnfv_maas_node02_power_address: {{ conf['nodes'][1]['remote_management']['address'].rsplit('/')[0] }}
     opnfv_maas_node02_power_type: {{ conf['nodes'][1]['remote_management']['type'] }}
     opnfv_maas_node02_power_user: {{ conf['nodes'][1]['remote_management']['user'] }}
     opnfv_maas_node02_power_password: {{ conf['nodes'][1]['remote_management']['pass'] }}
-    opnfv_maas_node02_interface_mac: '{{ conf['nodes'][1]['interfaces'][1] }}'
+    opnfv_maas_node02_interface_mac: '{{ conf['nodes'][1]['interfaces'][pxe_interface]['mac_address'] }}'
 
     opnfv_maas_node03_architecture: '{{ conf['nodes'][2]['node']['arch'] | dpkg_arch }}/generic'
-    opnfv_maas_node03_power_address: {{ conf['nodes'][2]['remote_management']['address'] }}
+    opnfv_maas_node03_power_address: {{ conf['nodes'][2]['remote_management']['address'].rsplit('/')[0] }}
     opnfv_maas_node03_power_type: {{ conf['nodes'][2]['remote_management']['type'] }}
     opnfv_maas_node03_power_user: {{ conf['nodes'][2]['remote_management']['user'] }}
     opnfv_maas_node03_power_password: {{ conf['nodes'][2]['remote_management']['pass'] }}
-    opnfv_maas_node03_interface_mac: '{{ conf['nodes'][2]['interfaces'][1] }}'
+    opnfv_maas_node03_interface_mac: '{{ conf['nodes'][2]['interfaces'][pxe_interface]['mac_address'] }}'
 
     opnfv_maas_node04_architecture: '{{ conf['nodes'][3]['node']['arch'] | dpkg_arch }}/generic'
-    opnfv_maas_node04_power_address: {{ conf['nodes'][3]['remote_management']['address'] }}
+    opnfv_maas_node04_power_address: {{ conf['nodes'][3]['remote_management']['address'].rsplit('/')[0] }}
     opnfv_maas_node04_power_type: {{ conf['nodes'][3]['remote_management']['type'] }}
     opnfv_maas_node04_power_user: {{ conf['nodes'][3]['remote_management']['user'] }}
     opnfv_maas_node04_power_password: {{ conf['nodes'][3]['remote_management']['pass'] }}
-    opnfv_maas_node04_interface_mac: '{{ conf['nodes'][3]['interfaces'][1] }}'
+    opnfv_maas_node04_interface_mac: '{{ conf['nodes'][3]['interfaces'][pxe_interface]['mac_address'] }}'
 
     opnfv_maas_node05_architecture: '{{ conf['nodes'][4]['node']['arch'] | dpkg_arch }}/generic'
-    opnfv_maas_node05_power_address: {{ conf['nodes'][4]['remote_management']['address'] }}
+    opnfv_maas_node05_power_address: {{ conf['nodes'][4]['remote_management']['address'].rsplit('/')[0] }}
     opnfv_maas_node05_power_type: {{ conf['nodes'][4]['remote_management']['type'] }}
     opnfv_maas_node05_power_user: {{ conf['nodes'][4]['remote_management']['user'] }}
     opnfv_maas_node05_power_password: {{ conf['nodes'][4]['remote_management']['pass'] }}
-    opnfv_maas_node05_interface_mac: '{{ conf['nodes'][4]['interfaces'][1] }}'
+    opnfv_maas_node05_interface_mac: '{{ conf['nodes'][4]['interfaces'][pxe_interface]['mac_address'] }}'