From e1c6fcd4f6e8069f4626d82f8c0c7ef13b4bf714 Mon Sep 17 00:00:00 2001 From: Guillermo Herrero Date: Thu, 21 Dec 2017 13:02:43 +0100 Subject: [PATCH] [fuel] add main check for idf.fuel - Installer adapter will check first if POD idf has a fuel section. If not it will just generate and return an empty set - While at it, jinja2 code was simplified to dot syntax Change-Id: Ie040b1263ccae083e20cc57435639453d2456426 Signed-off-by: Guillermo Herrero --- config/installers/fuel/pod_config.yml.j2 | 228 +++++++++++++++---------------- 1 file changed, 114 insertions(+), 114 deletions(-) diff --git a/config/installers/fuel/pod_config.yml.j2 b/config/installers/fuel/pod_config.yml.j2 index 28c61888..06836e9f 100644 --- a/config/installers/fuel/pod_config.yml.j2 +++ b/config/installers/fuel/pod_config.yml.j2 @@ -1,97 +1,96 @@ -{%- 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'] -%} - {%- 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'] -%} - {%- endif -%} -{%- 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 = '1000' -%} - {%- set pxe_interface = 0 -%} -{%- endif -%} +{%- if 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 -%} + {%- 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 -%} + {%- endif -%} + {%- 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 = '1000' -%} + {%- set pxe_interface = 0 -%} + {%- endif -%} -{%- if dns_public is not defined -%} - {%- set dns_public = [ '8.8.8.8', '8.8.4.4' ] -%} -{%- endif -%} -{%- if net_public_gw is not defined -%} - {%- set net_public_gw = net_public | ipaddr_index('1') -%} -{%- endif -%} + {%- if dns_public is not defined -%} + {%- set dns_public = [ '8.8.8.8', '8.8.4.4' ] -%} + {%- endif -%} + {%- if net_public_gw is not defined -%} + {%- set net_public_gw = net_public | ipaddr_index('1') -%} + {%- endif -%} --- parameters: _param: -{%- if conf.idf is defined %} - opnfv_jump_bridge_admin: {{ conf['idf']['fuel']['jumphost']['bridges']['admin'] }} - opnfv_jump_bridge_mgmt: {{ conf['idf']['fuel']['jumphost']['bridges']['mgmt'] }} - opnfv_jump_bridge_private: {{ conf['idf']['fuel']['jumphost']['bridges']['private'] }} - opnfv_jump_bridge_public: {{ conf['idf']['fuel']['jumphost']['bridges']['public'] }} -{%- endif %} + opnfv_jump_bridge_admin: {{ conf.idf.fuel.jumphost.bridges.admin }} + opnfv_jump_bridge_mgmt: {{ conf.idf.fuel.jumphost.bridges.mgmt }} + opnfv_jump_bridge_private: {{ conf.idf.fuel.jumphost.bridges.private }} + opnfv_jump_bridge_public: {{ conf.idf.fuel.jumphost.bridges.public }} - 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_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') }} - opnfv_infra_kvm_node03_address: {{ net_mgmt | ipaddr_index('143') }} + 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_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) }} + opnfv_infra_kvm_node03_address: {{ net_mgmt | ipaddr_index(143) }} opnfv_infra_maas_pxe_network_address: {{ net_admin }} - opnfv_infra_maas_pxe_address: {{ net_admin | ipaddr_index('3') }} - opnfv_infra_maas_pxe_start_address: {{ net_admin | ipaddr_index('5') }} - opnfv_infra_maas_pxe_end_address: {{ net_admin | ipaddr_index('250') }} + opnfv_infra_maas_pxe_address: {{ net_admin | ipaddr_index(3) }} + opnfv_infra_maas_pxe_start_address: {{ net_admin | ipaddr_index(5) }} + opnfv_infra_maas_pxe_end_address: {{ net_admin | ipaddr_index(250) }} - opnfv_openstack_gateway_node01_address: {{ net_mgmt | ipaddr_index('124') }} - opnfv_openstack_gateway_node02_address: {{ net_mgmt | ipaddr_index('125') }} - opnfv_openstack_gateway_node03_address: {{ net_mgmt | ipaddr_index('126') }} - 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_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_proxy_node01_control_address: {{ net_mgmt | ipaddr_index('104') }} - opnfv_openstack_proxy_node02_control_address: {{ net_mgmt | 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') }} - opnfv_openstack_control_node03_address: {{ net_mgmt | ipaddr_index('13') }} - opnfv_openstack_database_address: {{ net_mgmt | ipaddr_index('50') }} - opnfv_openstack_database_node01_address: {{ net_mgmt | ipaddr_index('51') }} - opnfv_openstack_database_node02_address: {{ net_mgmt | ipaddr_index('52') }} - opnfv_openstack_database_node03_address: {{ net_mgmt | ipaddr_index('53') }} - opnfv_openstack_message_queue_address: {{ net_mgmt | ipaddr_index('40') }} - opnfv_openstack_message_queue_node01_address: {{ net_mgmt | ipaddr_index('41') }} - opnfv_openstack_message_queue_node02_address: {{ net_mgmt | ipaddr_index('42') }} - opnfv_openstack_message_queue_node03_address: {{ net_mgmt | ipaddr_index('43') }} - opnfv_openstack_telemetry_address: {{ net_mgmt | ipaddr_index('75') }} - opnfv_openstack_telemetry_node01_address: {{ net_mgmt | ipaddr_index('76') }} - opnfv_openstack_telemetry_node02_address: {{ net_mgmt | ipaddr_index('77') }} - opnfv_openstack_telemetry_node03_address: {{ net_mgmt | ipaddr_index('78') }} - opnfv_openstack_compute_node01_single_address: {{ net_mgmt | ipaddr_index('101') }} - opnfv_openstack_compute_node02_single_address: {{ net_mgmt | ipaddr_index('102') }} - opnfv_openstack_compute_node03_single_address: {{ net_mgmt | ipaddr_index('103') }} - opnfv_openstack_compute_node01_control_address: {{ net_mgmt | ipaddr_index('101') }} - opnfv_openstack_compute_node02_control_address: {{ net_mgmt | ipaddr_index('102') }} - opnfv_openstack_compute_node03_control_address: {{ net_mgmt | ipaddr_index('103') }} - opnfv_openstack_compute_node01_tenant_address: {{ net_private | ipaddr_index('101') }} - opnfv_openstack_compute_node02_tenant_address: {{ net_private | ipaddr_index('102') }} - opnfv_openstack_compute_node03_tenant_address: {{ net_private | ipaddr_index('103') }} - opnfv_openstack_compute_node01_external_address: {{ net_public | ipaddr_index('101') }} - opnfv_openstack_compute_node02_external_address: {{ net_public | ipaddr_index('102') }} + opnfv_openstack_gateway_node01_address: {{ net_mgmt | ipaddr_index(124) }} + opnfv_openstack_gateway_node02_address: {{ net_mgmt | ipaddr_index(125) }} + opnfv_openstack_gateway_node03_address: {{ net_mgmt | ipaddr_index(126) }} + 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_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_proxy_node01_control_address: {{ net_mgmt | ipaddr_index(104) }} + opnfv_openstack_proxy_node02_control_address: {{ net_mgmt | 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) }} + opnfv_openstack_control_node03_address: {{ net_mgmt | ipaddr_index(13) }} + opnfv_openstack_database_address: {{ net_mgmt | ipaddr_index(50) }} + opnfv_openstack_database_node01_address: {{ net_mgmt | ipaddr_index(51) }} + opnfv_openstack_database_node02_address: {{ net_mgmt | ipaddr_index(52) }} + opnfv_openstack_database_node03_address: {{ net_mgmt | ipaddr_index(53) }} + opnfv_openstack_message_queue_address: {{ net_mgmt | ipaddr_index(40) }} + opnfv_openstack_message_queue_node01_address: {{ net_mgmt | ipaddr_index(41) }} + opnfv_openstack_message_queue_node02_address: {{ net_mgmt | ipaddr_index(42) }} + opnfv_openstack_message_queue_node03_address: {{ net_mgmt | ipaddr_index(43) }} + opnfv_openstack_telemetry_address: {{ net_mgmt | ipaddr_index(75) }} + opnfv_openstack_telemetry_node01_address: {{ net_mgmt | ipaddr_index(76) }} + opnfv_openstack_telemetry_node02_address: {{ net_mgmt | ipaddr_index(77) }} + opnfv_openstack_telemetry_node03_address: {{ net_mgmt | ipaddr_index(78) }} + opnfv_openstack_compute_node01_single_address: {{ net_mgmt | ipaddr_index(101) }} + opnfv_openstack_compute_node02_single_address: {{ net_mgmt | ipaddr_index(102) }} + opnfv_openstack_compute_node03_single_address: {{ net_mgmt | ipaddr_index(103) }} + opnfv_openstack_compute_node01_control_address: {{ net_mgmt | ipaddr_index(101) }} + opnfv_openstack_compute_node02_control_address: {{ net_mgmt | ipaddr_index(102) }} + opnfv_openstack_compute_node03_control_address: {{ net_mgmt | ipaddr_index(103) }} + opnfv_openstack_compute_node01_tenant_address: {{ net_private | ipaddr_index(101) }} + opnfv_openstack_compute_node02_tenant_address: {{ net_private | ipaddr_index(102) }} + opnfv_openstack_compute_node03_tenant_address: {{ net_private | ipaddr_index(103) }} + opnfv_openstack_compute_node01_external_address: {{ net_public | ipaddr_index(101) }} + opnfv_openstack_compute_node02_external_address: {{ net_public | ipaddr_index(102) }} - opnfv_opendaylight_server_node01_single_address: {{ net_mgmt | ipaddr_index('111') }} + opnfv_opendaylight_server_node01_single_address: {{ net_mgmt | ipaddr_index(111) }} opnfv_net_public_gw: {{ net_public_gw }} opnfv_name_servers: {{ dns_public }} @@ -100,37 +99,38 @@ parameters: 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'].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'][pxe_interface]['mac_address'] }}' + opnfv_maas_node01_architecture: '{{ conf.nodes.0.node.arch | dpkg_arch }}/generic' + 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[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'].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'][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.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[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'].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'][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.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[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'].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'][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.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[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'].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'][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.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[pxe_interface].mac_address }}' +{%- endif -%} -- 2.16.6