diff options
Diffstat (limited to 'config/installers')
-rw-r--r-- | config/installers/daisy/network.yaml.j2 | 3 | ||||
-rw-r--r-- | config/installers/fuel/pod_config.yml.j2 | 12 |
2 files changed, 11 insertions, 4 deletions
diff --git a/config/installers/daisy/network.yaml.j2 b/config/installers/daisy/network.yaml.j2 index 1fad1ac8..f976ab73 100644 --- a/config/installers/daisy/network.yaml.j2 +++ b/config/installers/daisy/network.yaml.j2 @@ -72,7 +72,8 @@ networks: {%- set gateway = ".".join([ips[0], ips[1], ips[2], "1"]) -%} {%- endif -%} - {%- set networks = networks.update({key: {'interface_name': interface_name, + {#- set v=v.update(...) is unpredictable and breaks in older j2 -#} + {%- set _ = networks.update({key: {'interface_name': interface_name, 'bus_addr': bus_addr, 'vlan': vlan, 'network': network, diff --git a/config/installers/fuel/pod_config.yml.j2 b/config/installers/fuel/pod_config.yml.j2 index b3fd9c45..65336a5b 100644 --- a/config/installers/fuel/pod_config.yml.j2 +++ b/config/installers/fuel/pod_config.yml.j2 @@ -59,9 +59,12 @@ parameters: 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_gateway_node01_tenant_address: {{ net_private | ipaddr_index(124) }} + opnfv_openstack_gateway_node02_tenant_address: {{ net_private | ipaddr_index(125) }} + opnfv_openstack_gateway_node03_tenant_address: {{ net_private | ipaddr_index(126) }} + opnfv_openstack_gateway_node01_external_address: {{ net_public | ipaddr_index(124) }} + opnfv_openstack_gateway_node02_external_address: {{ net_public | ipaddr_index(125) }} + opnfv_openstack_gateway_node03_external_address: {{ net_public | ipaddr_index(126) }} 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) }} @@ -72,6 +75,9 @@ parameters: 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_control_node01_external_address: {{ net_public | ipaddr_index(11) }} + opnfv_openstack_control_node02_external_address: {{ net_public | ipaddr_index(12) }} + opnfv_openstack_control_node03_external_address: {{ net_public | 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) }} |