diff options
Diffstat (limited to 'config/installers')
17 files changed, 62 insertions, 34 deletions
diff --git a/config/installers/apex/pod_config.yaml.j2 b/config/installers/apex/pod_config.yaml.j2 index b681215e..d4db9ef7 100644 --- a/config/installers/apex/pod_config.yaml.j2 +++ b/config/installers/apex/pod_config.yaml.j2 @@ -1,11 +1,18 @@ +############################################################################## +# Copyright (c) 2018 Red Hat Inc. and others. +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Apache License, Version 2.0 +# which accompanies this distribution, and is available at +# http://www.apache.org/licenses/LICENSE-2.0 +############################################################################## --- nodes: node1: mac_address: "{{ conf['nodes'][0]['remote_management']['mac_address'] }}" ipmi_ip: {{ conf['nodes'][0]['remote_management']['address'] }} - ipmi_user: {{ conf['jumphost']['remote_params']['user'] }} - ipmi_pass: {{ conf['jumphost']['remote_params']['pass'] }} - pm_type: "pxe_{{ conf['jumphost']['remote_params']['type'] }}tool" + ipmi_user: {{ conf['nodes'][0]['remote_management']['user'] }} + ipmi_pass: {{ conf['nodes'][0]['remote_management']['pass'] }} + pm_type: "pxe_{{ conf['nodes'][0]['remote_management']['type'] }}tool" cpus: {{ conf['nodes'][0]['node']['cpus'] }} memory: {{ conf['nodes'][0]['node']['memory'] }} disk: 40 @@ -15,9 +22,9 @@ nodes: node2: mac_address: "{{ conf['nodes'][1]['remote_management']['mac_address'] }}" ipmi_ip: {{ conf['nodes'][1]['remote_management']['address'] }} - ipmi_user: {{ conf['jumphost']['remote_params']['user'] }} - ipmi_pass: {{ conf['jumphost']['remote_params']['pass'] }} - pm_type: "pxe_{{ conf['jumphost']['remote_params']['type'] }}tool" + ipmi_user: {{ conf['nodes'][1]['remote_management']['user'] }} + ipmi_pass: {{ conf['nodes'][1]['remote_management']['pass'] }} + pm_type: "pxe_{{ conf['nodes'][1]['remote_management']['type'] }}tool" cpus: {{ conf['nodes'][1]['node']['cpus'] }} memory: {{ conf['nodes'][1]['node']['memory'] }} disk: 40 @@ -27,9 +34,9 @@ nodes: node3: mac_address: "{{ conf['nodes'][2]['remote_management']['mac_address'] }}" ipmi_ip: {{ conf['nodes'][2]['remote_management']['address'] }} - ipmi_user: {{ conf['jumphost']['remote_params']['user'] }} - ipmi_pass: {{ conf['jumphost']['remote_params']['pass'] }} - pm_type: "pxe_{{ conf['jumphost']['remote_params']['type'] }}tool" + ipmi_user: {{ conf['nodes'][2]['remote_management']['user'] }} + ipmi_pass: {{ conf['nodes'][2]['remote_management']['pass'] }} + pm_type: "pxe_{{ conf['nodes'][2]['remote_management']['type'] }}tool" cpus: {{ conf['nodes'][2]['node']['cpus'] }} memory: {{ conf['nodes'][2]['node']['memory'] }} disk: 40 @@ -39,9 +46,9 @@ nodes: node4: mac_address: "{{ conf['nodes'][3]['remote_management']['mac_address'] }}" ipmi_ip: {{ conf['nodes'][3]['remote_management']['address'] }} - ipmi_user: {{ conf['jumphost']['remote_params']['user'] }} - ipmi_pass: {{ conf['jumphost']['remote_params']['pass'] }} - pm_type: "pxe_{{ conf['jumphost']['remote_params']['type'] }}tool" + ipmi_user: {{ conf['nodes'][3]['remote_management']['user'] }} + ipmi_pass: {{ conf['nodes'][3]['remote_management']['pass'] }} + pm_type: "pxe_{{ conf['nodes'][3]['remote_management']['type'] }}tool" cpus: {{ conf['nodes'][3]['node']['cpus'] }} memory: {{ conf['nodes'][3]['node']['memory'] }} disk: 40 @@ -51,9 +58,9 @@ nodes: node5: mac_address: "{{ conf['nodes'][4]['remote_management']['mac_address'] }}" ipmi_ip: {{ conf['nodes'][4]['remote_management']['address'] }} - ipmi_user: {{ conf['jumphost']['remote_params']['user'] }} - ipmi_pass: {{ conf['jumphost']['remote_params']['pass'] }} - pm_type: "pxe_{{ conf['jumphost']['remote_params']['type'] }}tool" + ipmi_user: {{ conf['nodes'][4]['remote_management']['user'] }} + ipmi_pass: {{ conf['nodes'][4]['remote_management']['pass'] }} + pm_type: "pxe_{{ conf['nodes'][4]['remote_management']['type'] }}tool" cpus: {{ conf['nodes'][4]['node']['cpus'] }} memory: {{ conf['nodes'][4]['node']['memory'] }} disk: 40 diff --git a/config/installers/compass4nfv/network.yml.j2 b/config/installers/compass4nfv/network.yml.j2 index a98cc4a9..b84c201b 100644 --- a/config/installers/compass4nfv/network.yml.j2 +++ b/config/installers/compass4nfv/network.yml.j2 @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2017 HUAWEI TECHNOLOGIES CO.,LTD and others. +# Copyright (c) 2018 HUAWEI TECHNOLOGIES CO.,LTD and others. # # All rights reserved. This program and the accompanying materials # are made available under the terms of the Apache License, Version 2.0 diff --git a/config/installers/compass4nfv/network_ocl.yml.j2 b/config/installers/compass4nfv/network_ocl.yml.j2 index 4d1342d9..f435538c 100644 --- a/config/installers/compass4nfv/network_ocl.yml.j2 +++ b/config/installers/compass4nfv/network_ocl.yml.j2 @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2017 HUAWEI TECHNOLOGIES CO.,LTD and others. +# Copyright (c) 2018 HUAWEI TECHNOLOGIES CO.,LTD and others. # # All rights reserved. This program and the accompanying materials # are made available under the terms of the Apache License, Version 2.0 diff --git a/config/installers/compass4nfv/network_onos.yml.j2 b/config/installers/compass4nfv/network_onos.yml.j2 index 90174c85..7213e77f 100644 --- a/config/installers/compass4nfv/network_onos.yml.j2 +++ b/config/installers/compass4nfv/network_onos.yml.j2 @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2017 HUAWEI TECHNOLOGIES CO.,LTD and others. +# Copyright (c) 2018 HUAWEI TECHNOLOGIES CO.,LTD and others. # # All rights reserved. This program and the accompanying materials # are made available under the terms of the Apache License, Version 2.0 diff --git a/config/installers/compass4nfv/network_openo.yml.j2 b/config/installers/compass4nfv/network_openo.yml.j2 index 37b34c7f..9e3c6f09 100644 --- a/config/installers/compass4nfv/network_openo.yml.j2 +++ b/config/installers/compass4nfv/network_openo.yml.j2 @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2017 HUAWEI TECHNOLOGIES CO.,LTD and others. +# Copyright (c) 2018 HUAWEI TECHNOLOGIES CO.,LTD and others. # # All rights reserved. This program and the accompanying materials # are made available under the terms of the Apache License, Version 2.0 diff --git a/config/installers/compass4nfv/os-nosdn-nofeature-ha.yml.j2 b/config/installers/compass4nfv/os-nosdn-nofeature-ha.yml.j2 index 2dcf048c..bb235fb4 100644 --- a/config/installers/compass4nfv/os-nosdn-nofeature-ha.yml.j2 +++ b/config/installers/compass4nfv/os-nosdn-nofeature-ha.yml.j2 @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2017 HUAWEI TECHNOLOGIES CO.,LTD and others. +# Copyright (c) 2018 HUAWEI TECHNOLOGIES CO.,LTD and others. # # All rights reserved. This program and the accompanying materials # are made available under the terms of the Apache License, Version 2.0 diff --git a/config/installers/compass4nfv/os-nosdn-openo-ha.yml.j2 b/config/installers/compass4nfv/os-nosdn-openo-ha.yml.j2 index 6deb19de..9e7e01cc 100644 --- a/config/installers/compass4nfv/os-nosdn-openo-ha.yml.j2 +++ b/config/installers/compass4nfv/os-nosdn-openo-ha.yml.j2 @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2017 HUAWEI TECHNOLOGIES CO.,LTD and others. +# Copyright (c) 2018 HUAWEI TECHNOLOGIES CO.,LTD and others. # # All rights reserved. This program and the accompanying materials # are made available under the terms of the Apache License, Version 2.0 diff --git a/config/installers/compass4nfv/os-ocl-nofeature-ha.yml.j2 b/config/installers/compass4nfv/os-ocl-nofeature-ha.yml.j2 index d03c7e87..c7272cf3 100644 --- a/config/installers/compass4nfv/os-ocl-nofeature-ha.yml.j2 +++ b/config/installers/compass4nfv/os-ocl-nofeature-ha.yml.j2 @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2017 HUAWEI TECHNOLOGIES CO.,LTD and others. +# Copyright (c) 2018 HUAWEI TECHNOLOGIES CO.,LTD and others. # # All rights reserved. This program and the accompanying materials # are made available under the terms of the Apache License, Version 2.0 diff --git a/config/installers/compass4nfv/os-odl_l2-moon-ha.yml.j2 b/config/installers/compass4nfv/os-odl_l2-moon-ha.yml.j2 index d3d8aa1d..72d3f4c7 100644 --- a/config/installers/compass4nfv/os-odl_l2-moon-ha.yml.j2 +++ b/config/installers/compass4nfv/os-odl_l2-moon-ha.yml.j2 @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2017 HUAWEI TECHNOLOGIES CO.,LTD and others. +# Copyright (c) 2018 HUAWEI TECHNOLOGIES CO.,LTD and others. # # All rights reserved. This program and the accompanying materials # are made available under the terms of the Apache License, Version 2.0 diff --git a/config/installers/compass4nfv/os-odl_l2-nofeature-ha.yml.j2 b/config/installers/compass4nfv/os-odl_l2-nofeature-ha.yml.j2 index 1ba947a5..3a0c222e 100644 --- a/config/installers/compass4nfv/os-odl_l2-nofeature-ha.yml.j2 +++ b/config/installers/compass4nfv/os-odl_l2-nofeature-ha.yml.j2 @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2017 HUAWEI TECHNOLOGIES CO.,LTD and others. +# Copyright (c) 2018 HUAWEI TECHNOLOGIES CO.,LTD and others. # # All rights reserved. This program and the accompanying materials # are made available under the terms of the Apache License, Version 2.0 diff --git a/config/installers/compass4nfv/os-odl_l3-nofeature-ha.yml.j2 b/config/installers/compass4nfv/os-odl_l3-nofeature-ha.yml.j2 index d81769c4..d019c230 100644 --- a/config/installers/compass4nfv/os-odl_l3-nofeature-ha.yml.j2 +++ b/config/installers/compass4nfv/os-odl_l3-nofeature-ha.yml.j2 @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2017 HUAWEI TECHNOLOGIES CO.,LTD and others. +# Copyright (c) 2018 HUAWEI TECHNOLOGIES CO.,LTD and others. # # All rights reserved. This program and the accompanying materials # are made available under the terms of the Apache License, Version 2.0 diff --git a/config/installers/compass4nfv/os-onos-nofeature-ha.yml.j2 b/config/installers/compass4nfv/os-onos-nofeature-ha.yml.j2 index 8c731a5b..2adce440 100644 --- a/config/installers/compass4nfv/os-onos-nofeature-ha.yml.j2 +++ b/config/installers/compass4nfv/os-onos-nofeature-ha.yml.j2 @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2017 HUAWEI TECHNOLOGIES CO.,LTD and others. +# Copyright (c) 2018 HUAWEI TECHNOLOGIES CO.,LTD and others. # # All rights reserved. This program and the accompanying materials # are made available under the terms of the Apache License, Version 2.0 diff --git a/config/installers/compass4nfv/os-onos-sfc-ha.yml.j2 b/config/installers/compass4nfv/os-onos-sfc-ha.yml.j2 index bbc4723d..230a601f 100644 --- a/config/installers/compass4nfv/os-onos-sfc-ha.yml.j2 +++ b/config/installers/compass4nfv/os-onos-sfc-ha.yml.j2 @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2017 HUAWEI TECHNOLOGIES CO.,LTD and others. +# Copyright (c) 2018 HUAWEI TECHNOLOGIES CO.,LTD and others. # # All rights reserved. This program and the accompanying materials # are made available under the terms of the Apache License, Version 2.0 diff --git a/config/installers/daisy/network.yaml.j2 b/config/installers/daisy/network.yaml.j2 index f5ac6150..1fad1ac8 100644 --- a/config/installers/daisy/network.yaml.j2 +++ b/config/installers/daisy/network.yaml.j2 @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2017 ZTE Corporation and others. +# Copyright (c) 2018 ZTE Corporation and others. # # All rights reserved. This program and the accompanying materials # are made available under the terms of the Apache License, Version 2.0 diff --git a/config/installers/daisy/pod_config.yaml.j2 b/config/installers/daisy/pod_config.yaml.j2 index 3e4ab106..30147a5e 100644 --- a/config/installers/daisy/pod_config.yaml.j2 +++ b/config/installers/daisy/pod_config.yaml.j2 @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2017 ZTE Corporation and others. +# Copyright (c) 2018 ZTE Corporation and others. # # All rights reserved. This program and the accompanying materials # are made available under the terms of the Apache License, Version 2.0 @@ -86,6 +86,6 @@ daisy_passwd: 'r00tme' {% if 'fixed_ips' in conf['jumphost'] -%} daisy_gateway: {{ conf['jumphost']['fixed_ips']['admin'] }} {%- else -%} -daisy_gateway: {{ conf['jumphost']['interfaces'][0]['address'][0] }} +daisy_gateway: {{ conf['jumphost']['interfaces'][0]['address'] }} {%- endif %} ceph_disk_name: '/dev/sdb' diff --git a/config/installers/fuel/pod_config.yml.j2 b/config/installers/fuel/pod_config.yml.j2 index 8a4d869e..6d0e7978 100644 --- a/config/installers/fuel/pod_config.yml.j2 +++ b/config/installers/fuel/pod_config.yml.j2 @@ -1,3 +1,10 @@ +############################################################################## +# Copyright (c) 2018 Mirantis Inc., Enea AB and others. +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Apache License, Version 2.0 +# which accompanies this distribution, and is available at +# http://www.apache.org/licenses/LICENSE-2.0 +############################################################################## --- {%- if conf.idf is defined and conf.idf.fuel is defined -%} {%- if conf.idf.net_config is defined -%} @@ -5,6 +12,7 @@ {%- set net_mgmt = conf.idf.net_config.mgmt.network -%} {%- set net_private = conf.idf.net_config.private.network -%} {%- set net_public = conf.idf.net_config.public.network -%} + {%- set net_public_mask = conf.idf.net_config.public.mask -%} {%- set vlan_mgmt = conf.idf.net_config.mgmt.vlan -%} {%- set vlan_private = conf.idf.net_config.private.vlan -%} {%- if conf.idf.net_config.public.dns is defined -%} @@ -19,6 +27,7 @@ {%- set net_mgmt = '172.16.10.0' -%} {%- set net_private = '10.1.0.0' -%} {%- set net_public = '172.30.10.0' -%} + {%- set net_public_mask = '24' -%} {%- set vlan_mgmt = '300' -%} {%- set vlan_private = '1000' -%} {%- set pxe_interface = 0 -%} @@ -29,7 +38,7 @@ {%- endif -%} {%- if net_public_gw is not defined -%} {%- set net_public_gw = net_public | ipaddr_index('1') -%} - {%- endif %} + {%- endif -%} parameters: _param: @@ -39,6 +48,7 @@ parameters: opnfv_jump_bridge_public: {{ conf.idf.fuel.jumphost.bridges.public }} opnfv_infra_config_address: {{ net_mgmt | ipaddr_index(100) }} + opnfv_infra_config_pxe_address: {{ net_admin | ipaddr_index(2) }} 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) }} @@ -47,9 +57,8 @@ parameters: 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_start_address: {{ net_admin | ipaddr_index(4) }} + opnfv_infra_maas_pxe_end_address: {{ net_admin | ipaddr_index(100) }} opnfv_openstack_gateway_node01_address: {{ net_mgmt | ipaddr_index(124) }} opnfv_openstack_gateway_node02_address: {{ net_mgmt | ipaddr_index(125) }} @@ -60,6 +69,7 @@ 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_control_address: {{ net_mgmt | ipaddr_index(103) }} 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) }} @@ -92,7 +102,11 @@ parameters: opnfv_opendaylight_server_node01_single_address: {{ net_mgmt | ipaddr_index(111) }} + opnfv_net_public: {{ net_public }}/{{ net_public_mask }} + opnfv_net_public_mask: {{ net_public_mask | netmask }} opnfv_net_public_gw: {{ net_public_gw }} + opnfv_net_public_pool_start: {{ net_public | ipaddr_index(80) }} + opnfv_net_public_pool_end: {{ net_public | ipaddr_index(100) }} opnfv_name_servers: {{ dns_public }} opnfv_dns_server01: '{{ dns_public[0] }}' diff --git a/config/installers/joid/pod_config.yaml.j2 b/config/installers/joid/pod_config.yaml.j2 index 4bb49d56..e18ba86f 100644 --- a/config/installers/joid/pod_config.yaml.j2 +++ b/config/installers/joid/pod_config.yaml.j2 @@ -1,3 +1,10 @@ +############################################################################## +# Copyright (c) 2018 Canonical Ltd. and others. +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Apache License, Version 2.0 +# which accompanies this distribution, and is available at +# http://www.apache.org/licenses/LICENSE-2.0 +############################################################################## --- lab: location: intel |