summaryrefslogtreecommitdiffstats
path: root/config/installers
diff options
context:
space:
mode:
Diffstat (limited to 'config/installers')
-rw-r--r--config/installers/fuel/pod_config.yml.j238
1 files changed, 28 insertions, 10 deletions
diff --git a/config/installers/fuel/pod_config.yml.j2 b/config/installers/fuel/pod_config.yml.j2
index c2f14035..28c61888 100644
--- a/config/installers/fuel/pod_config.yml.j2
+++ b/config/installers/fuel/pod_config.yml.j2
@@ -8,6 +8,10 @@
{%- 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' -%}
@@ -15,28 +19,39 @@
{%- 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 -%}
-
-{%- set pxe_interface = 0 -%}
+{%- 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_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_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_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') }}
@@ -46,6 +61,8 @@ parameters:
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') }}
@@ -76,6 +93,7 @@ parameters:
opnfv_opendaylight_server_node01_single_address: {{ net_mgmt | ipaddr_index('111') }}
+ opnfv_net_public_gw: {{ net_public_gw }}
opnfv_name_servers: {{ dns_public }}
opnfv_dns_server01: '{{ dns_public[0] }}'
@@ -83,35 +101,35 @@ 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'][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'][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'][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'][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'] }}