diff options
Diffstat (limited to 'config/installers')
-rw-r--r-- | config/installers/daisy/pod_config.yaml.j2 | 91 | ||||
-rw-r--r-- | config/installers/fuel/pod_config.yml.j2 | 10 |
2 files changed, 56 insertions, 45 deletions
diff --git a/config/installers/daisy/pod_config.yaml.j2 b/config/installers/daisy/pod_config.yaml.j2 index 9a4ac7b5..776d2ecf 100644 --- a/config/installers/daisy/pod_config.yaml.j2 +++ b/config/installers/daisy/pod_config.yaml.j2 @@ -1,45 +1,56 @@ +############################################################################## +# Copyright (c) 2017 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 +# which accompanies this distribution, and is available at +# http://www.apache.org/licenses/LICENSE-2.0 +############################################################################## + +--- + adapter: {{ conf['jumphost']['remote_params']['type'] }} hosts: -- name: 'controller01' - roles: - - 'CONTROLLER_LB' - ipmi_ip: {{ conf['nodes'][0]['remote_management']['address'] }} - ipmi_user: {{ conf['nodes'][0]['remote_management']['user'] }} - ipmi_pass: {{ conf['nodes'][0]['remote_management']['pass'] }} - mac_addresses:{% for nic in conf['nodes'][0]['interfaces'] %} - - {{ nic['mac_address'] }}{% endfor %} -- name: 'controller02' - roles: - - 'CONTROLLER_LB' - ipmi_ip: {{ conf['nodes'][1]['remote_management']['address'] }} - ipmi_user: {{ conf['nodes'][1]['remote_management']['user'] }} - ipmi_pass: {{ conf['nodes'][1]['remote_management']['pass'] }} - mac_addresses:{% for nic in conf['nodes'][1]['interfaces'] %} - - {{ nic['mac_address'] }}{% endfor %} -- name: 'controller03' - roles: - - 'CONTROLLER_LB' - ipmi_ip: {{ conf['nodes'][2]['remote_management']['address'] }} - ipmi_user: {{ conf['nodes'][2]['remote_management']['user'] }} - ipmi_pass: {{ conf['nodes'][2]['remote_management']['pass'] }} - mac_addresses:{% for nic in conf['nodes'][2]['interfaces'] %} - - {{ nic['mac_address'] }}{% endfor %} -- name: 'computer01' - roles: - - 'COMPUTER' - ipmi_ip: {{ conf['nodes'][3]['remote_management']['address'] }} - ipmi_user: {{ conf['nodes'][3]['remote_management']['user'] }} - ipmi_pass: {{ conf['nodes'][3]['remote_management']['pass'] }} - mac_addresses:{% for nic in conf['nodes'][3]['interfaces'] %} - - {{ nic['mac_address'] }}{% endfor %} -- name: 'computer02' - roles: - - 'COMPUTER' - ipmi_ip: {{ conf['nodes'][4]['remote_management']['address'] }} - ipmi_user: {{ conf['nodes'][4]['remote_management']['user'] }} - ipmi_pass: {{ conf['nodes'][4]['remote_management']['pass'] }} - mac_addresses:{% for nic in conf['nodes'][4]['interfaces'] %} - - {{ nic['mac_address'] }}{% endfor %} + - name: 'controller01' + roles: + - 'CONTROLLER_LB' + ipmi_ip: {{ conf['nodes'][0]['remote_management']['address'] }} + ipmi_user: {{ conf['nodes'][0]['remote_management']['user'] }} + ipmi_pass: {{ conf['nodes'][0]['remote_management']['pass'] }} + mac_addresses:{% for nic in conf['nodes'][0]['interfaces'] %} + - {{ nic['mac_address'] }}{% endfor %} + - name: 'controller02' + roles: + - 'CONTROLLER_LB' + ipmi_ip: {{ conf['nodes'][1]['remote_management']['address'] }} + ipmi_user: {{ conf['nodes'][1]['remote_management']['user'] }} + ipmi_pass: {{ conf['nodes'][1]['remote_management']['pass'] }} + mac_addresses:{% for nic in conf['nodes'][1]['interfaces'] %} + - {{ nic['mac_address'] }}{% endfor %} + - name: 'controller03' + roles: + - 'CONTROLLER_LB' + ipmi_ip: {{ conf['nodes'][2]['remote_management']['address'] }} + ipmi_user: {{ conf['nodes'][2]['remote_management']['user'] }} + ipmi_pass: {{ conf['nodes'][2]['remote_management']['pass'] }} + mac_addresses:{% for nic in conf['nodes'][2]['interfaces'] %} + - {{ nic['mac_address'] }}{% endfor %} + - name: 'computer01' + roles: + - 'COMPUTER' + ipmi_ip: {{ conf['nodes'][3]['remote_management']['address'] }} + ipmi_user: {{ conf['nodes'][3]['remote_management']['user'] }} + ipmi_pass: {{ conf['nodes'][3]['remote_management']['pass'] }} + mac_addresses:{% for nic in conf['nodes'][3]['interfaces'] %} + - {{ nic['mac_address'] }}{% endfor %} + - name: 'computer02' + roles: + - 'COMPUTER' + ipmi_ip: {{ conf['nodes'][4]['remote_management']['address'] }} + ipmi_user: {{ conf['nodes'][4]['remote_management']['user'] }} + ipmi_pass: {{ conf['nodes'][4]['remote_management']['pass'] }} + mac_addresses:{% for nic in conf['nodes'][4]['interfaces'] %} + - {{ nic['mac_address'] }}{% endfor %} disks: daisy: 50 daisy_passwd: 'r00tme' diff --git a/config/installers/fuel/pod_config.yml.j2 b/config/installers/fuel/pod_config.yml.j2 index c98703cf..28c0b47b 100644 --- a/config/installers/fuel/pod_config.yml.j2 +++ b/config/installers/fuel/pod_config.yml.j2 @@ -8,6 +8,7 @@ {%- 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'] -%} {%- else -%} {%- set net_admin = '192.168.11.0' -%} {%- set net_mgmt = '172.16.10.0' -%} @@ -15,13 +16,12 @@ {%- 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 -%} --- parameters: _param: @@ -43,9 +43,9 @@ parameters: 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_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_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') }} |