diff options
| -rw-r--r-- | config/installers/fuel/pod_config.yml.j2 | 29 | ||||
| -rwxr-xr-x | config/utils/generate_config.py | 8 |
2 files changed, 23 insertions, 14 deletions
diff --git a/config/installers/fuel/pod_config.yml.j2 b/config/installers/fuel/pod_config.yml.j2 index 5406d76f..b412885f 100644 --- a/config/installers/fuel/pod_config.yml.j2 +++ b/config/installers/fuel/pod_config.yml.j2 @@ -14,13 +14,14 @@ {%- 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 dns_public is not defined -%} {%- set dns_public = [ '8.8.8.8', '8.8.4.4' ] -%} {%- endif -%} +{%- set pxe_interface = 0 -%} --- parameters: _param: @@ -42,9 +43,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 +83,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'] }}' diff --git a/config/utils/generate_config.py b/config/utils/generate_config.py index a32367af..18af98db 100755 --- a/config/utils/generate_config.py +++ b/config/utils/generate_config.py @@ -2,6 +2,7 @@ """This module does blah blah.""" import argparse import ipaddress +import os import yaml from jinja2 import Environment, FileSystemLoader @@ -44,6 +45,13 @@ ENV.filters['dpkg_arch'] = dpkg_arch with open(ARGS.yaml) as _: DICT = yaml.safe_load(_) +# If an installer descriptor file (IDF) exists, include it (temporary) +IDF_PATH = '/idf-'.join(os.path.split(ARGS.yaml)) +if os.path.exists(IDF_PATH): + with open(IDF_PATH) as _: + IDF = yaml.safe_load(_) + DICT['idf'] = IDF['idf'] + # Print dictionary generated from yaml (uncomment for debug) # print(DICT) |