From 3a8defe6ca168b2a7739ff4fb64543da10f2b3e7 Mon Sep 17 00:00:00 2001 From: Guillermo Herrero Date: Fri, 22 Sep 2017 15:30:15 +0200 Subject: Add fuel installer adapter v3 -> v4: - extract common variable refs, fold some reusable code; - provide dummy defaults for PDFs without net_config; - keep yamllint happy about spaces and empty lines; v4 -> v5: - more folding, define a macro for multiple IP address definition; v5 -> v6: - added MaaS network / DHCP range support; v6 -> v7: - removed macro, template code reverted to output style JIRA: FUEL-275 Change-Id: Ib1cc319534d06c088b1db16a43aef663a8ada0d8 Signed-off-by: Guillermo Herrero Signed-off-by: Alexandru Avadanii (cherry picked from commit 25b2adb887b5e1cab767023476dd0ec2f02b4b59) --- config/installers/fuel/pod_config.yml.j2 | 114 +++++++++++++++++++++++++++++++ 1 file changed, 114 insertions(+) create mode 100644 config/installers/fuel/pod_config.yml.j2 diff --git a/config/installers/fuel/pod_config.yml.j2 b/config/installers/fuel/pod_config.yml.j2 new file mode 100644 index 00000000..370a3b95 --- /dev/null +++ b/config/installers/fuel/pod_config.yml.j2 @@ -0,0 +1,114 @@ +{%- 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'] -%} +{%- 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' -%} +{%- endif -%} + +{%- if conf.net_config.public.dns is defined -%} + {%- set dns_public = conf['net_config']['public']['dns'] -%} +{%- else -%} + {%- set dns_public = [ '8.8.8.8', '8.8.4.4' ] -%} +{%- endif -%} + +--- +parameters: + _param: + + 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') }} + opnfv_infra_kvm_node03_address: {{ net_mgmt | ipaddr_index('143') }} + + 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_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_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_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_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_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_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_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_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_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_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_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_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_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] }}' -- cgit 1.2.3-korg