aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwu.zhihui <wu.zhihui1@zte.com.cn>2016-08-18 09:24:44 +0000
committerGerrit Code Review <gerrit@172.30.200.206>2016-08-18 09:24:44 +0000
commit2814d4977051e55d421f9c506ecd8330e9abd6b4 (patch)
tree806db6e3c6f74030db6764838ed4be9de4754399
parent51ce0d350633ca4082ef1d5a74d61fb97c176938 (diff)
parent6119e4123ff93de8e14339bec6cb8a337f76edc9 (diff)
Merge "update zte-pod1 configuration files"
-rw-r--r--labs/zte/pod1/fuel/config/dea-pod-override.yaml219
-rw-r--r--labs/zte/pod1/fuel/config/dha.yaml23
2 files changed, 153 insertions, 89 deletions
diff --git a/labs/zte/pod1/fuel/config/dea-pod-override.yaml b/labs/zte/pod1/fuel/config/dea-pod-override.yaml
index c1f36da..ebca1e1 100644
--- a/labs/zte/pod1/fuel/config/dea-pod-override.yaml
+++ b/labs/zte/pod1/fuel/config/dea-pod-override.yaml
@@ -13,29 +13,31 @@ dea-pod-override-config-metadata:
created: 'Jan 26 2016'
comment: 'Rebased for Fuel8'
environment:
- name: opnfv-zte
+ name: opnfv
fuel:
ADMIN_NETWORK:
- dhcp_pool_end: 10.20.0.254
- dhcp_pool_start: 10.20.0.20
- ipaddress: 10.20.0.2
+ dhcp_pool_end: 10.20.6.200
+ dhcp_pool_start: 10.20.6.10
+ ipaddress: 10.20.6.2
netmask: 255.255.255.0
DNS_DOMAIN: domain.tld
DNS_SEARCH: domain.tld
- DNS_UPSTREAM: 114.114.114.114
+ DNS_UPSTREAM: 172.60.0.1
HOSTNAME: fuel
- NTP1: 10.20.0.1
+ NTP1: 172.60.0.1
NTP2:
NTP3:
interfaces_1:
- enp129s0f0:
+ ens4f0:
- fuelweb_admin
+ ens12f0:
- management
- enp2s0f0:
+ ens12f1:
+ - storage
+ ens44f0:
- private
+ ens44f1:
- public
- enp132s0f0:
- - storage
transformations_1:
transformations:
- action: add-br
@@ -58,30 +60,31 @@ transformations_1:
- action: add-br
name: br-mesh
- action: add-port
- bridge: br-fw-admin
- name: enp129s0f0
- - action: add-port
bridge: br-mgmt
- name: enp129s0f0.101
+ name: ens12f0.161
- action: add-port
bridge: br-storage
- name: enp132s0f0.102
+ name: ens12f1.162
+ - action: add-port
+ bridge: br-mesh
+ name: ens44f0.1120
- action: add-port
bridge: br-ex
- name: enp2s0f0
+ name: ens44f1.163
- action: add-port
- bridge: br-mesh
- name: enp2s0f0.103
+ bridge: br-fw-admin
+ name: ens4f0
+ version: '1.1'
network:
networking_parameters:
base_mac: fa:16:3e:00:00:00
configuration_template: null
dns_nameservers:
- - 114.114.114.114
+ - 172.60.0.1
floating_name: admin_floating_net
floating_ranges:
- - - 172.10.0.130
- - 172.10.0.254
+ - - 172.60.0.130
+ - 172.60.0.230
gre_id_range:
- 2
- 65535
@@ -94,52 +97,13 @@ network:
- 1000
- 1030
networks:
- - cidr: 172.10.0.0/24
- gateway: 172.10.0.1
- ip_ranges:
- - - 172.10.0.2
- - 172.10.0.126
- meta:
- cidr: 172.10.0.0/24
- configurable: true
- floating_range_var: floating_ranges
- ip_range:
- - 172.10.0.2
- - 172.10.0.126
- map_priority: 1
- name: public
- notation: ip_ranges
- render_addr_mask: public
- render_type: null
- use_gateway: true
- vips:
- - haproxy
- - vrouter
- vlan_start: null
- name: public
- vlan_start: null
- - cidr: 192.168.11.0/24
+ - cidr: 192.168.61.0/24
gateway: null
+ group_id: 2
+ id: 7
ip_ranges:
- - - 192.168.11.1
- - 192.168.11.254
- meta:
- cidr: 192.168.1.0/24
- configurable: true
- map_priority: 2
- name: storage
- notation: cidr
- render_addr_mask: storage
- render_type: cidr
- use_gateway: false
- vlan_start: 102
- name: storage
- vlan_start: 102
- - cidr: 192.168.10.0/24
- gateway: null
- ip_ranges:
- - - 192.168.10.1
- - 192.168.10.254
+ - - 192.168.61.1
+ - 192.168.61.254
meta:
cidr: 192.168.0.0/24
configurable: true
@@ -154,12 +118,14 @@ network:
- vrouter
vlan_start: 101
name: management
- vlan_start: 101
- - cidr: 192.168.12.0/24
+ vlan_start: 161
+ - cidr: 192.168.63.0/24
gateway: null
+ group_id: 2
+ id: 9
ip_ranges:
- - - 192.168.12.1
- - 192.168.12.254
+ - - 192.168.63.1
+ - 192.168.63.254
meta:
cidr: 192.168.2.0/24
configurable: true
@@ -172,12 +138,59 @@ network:
use_gateway: false
vlan_start: 103
name: private
- vlan_start: 103
- - cidr: 10.20.0.0/24
- gateway: 10.20.0.2
+ vlan_start: 1120
+ - cidr: 172.60.0.0/24
+ gateway: 172.60.0.1
+ group_id: 2
+ id: 6
ip_ranges:
- - - 10.20.0.20
- - 10.20.0.254
+ - - 172.60.0.10
+ - 172.60.0.126
+ meta:
+ cidr: 172.16.0.0/24
+ configurable: true
+ floating_range_var: floating_ranges
+ ip_range:
+ - 172.16.0.2
+ - 172.16.0.126
+ map_priority: 1
+ name: public
+ notation: ip_ranges
+ render_addr_mask: public
+ render_type: null
+ use_gateway: true
+ vips:
+ - haproxy
+ - vrouter
+ vlan_start: null
+ name: public
+ vlan_start: 163
+ - cidr: 192.168.62.0/24
+ gateway: null
+ group_id: 2
+ id: 8
+ ip_ranges:
+ - - 192.168.62.1
+ - 192.168.62.254
+ meta:
+ cidr: 192.168.1.0/24
+ configurable: true
+ map_priority: 2
+ name: storage
+ notation: cidr
+ render_addr_mask: storage
+ render_type: cidr
+ use_gateway: false
+ vlan_start: 102
+ name: storage
+ vlan_start: 162
+ - cidr: 10.20.6.0/24
+ gateway: 10.20.6.2
+ group_id: null
+ id: 1
+ ip_ranges:
+ - - 10.20.6.10
+ - 10.20.6.200
meta:
configurable: false
map_priority: 0
@@ -188,8 +201,8 @@ network:
use_gateway: true
name: fuelweb_admin
vlan_start: null
- public_vip: 172.10.0.2
- public_vrouter_vip: 172.10.0.3
+ public_vip: 172.60.0.11
+ public_vrouter_vip: 172.60.0.10
settings:
editable:
external_dns:
@@ -200,7 +213,7 @@ settings:
error: Invalid IP address list
source: ^\*$|^(?:\d|1?\d\d|2[0-4]\d|25[0-5])(?:\.(?:\d|1?\d\d|2[0-4]\d|25[0-5])){3}(?:\s*,\s*(?:\d|1?\d\d|2[0-4]\d|25[0-5])(?:\.(?:\d|1?\d\d|2[0-4]\d|25[0-5])){3})*$
type: text
- value: 114.114.114.114
+ value: 172.60.0.1
weight: 10
metadata:
group: network
@@ -218,7 +231,7 @@ settings:
error: Invalid NTP server list
source: ^\s*(?:(?:\w+(?:-+\w+)*\.)+[a-z]+|\d{1,3}(?:\.\d{1,3}){3})\s*(?:,\s*(?:(?:\w+(?:-+\w+)*\.)+[a-z]+|\d{1,3}(\.\d{1,3}){3})\s*)*$
type: text
- value: 10.20.0.1
+ value: 172.60.0.1
weight: 10
syslog:
metadata:
@@ -278,4 +291,54 @@ settings:
type: checkbox
value: true
weight: 30
+ repo_setup:
+ metadata:
+ always_editable: true
+ group: general
+ label: Repositories
+ weight: 50
+ repos:
+ description: 'Please note: the first repository will be considered the operating
+ system mirror that will be used during node provisioning.
+
+ To create a local repository mirror on the Fuel master node, please follow
+ the instructions provided by running "fuel-createmirror --help" on the Fuel
+ master node.
+
+ Please make sure your Fuel master node has Internet access to the repository
+ before attempting to create a mirror.
+ '
+ extra_priority: null
+ type: custom_repo_configuration
+ value:
+ - name: ubuntu
+ priority: null
+ section: main universe multiverse
+ suite: trusty
+ type: deb
+ uri: http://10.20.6.2:8080/mirrors/ubuntu/
+ - name: ubuntu-updates
+ priority: null
+ section: main universe multiverse
+ suite: trusty-updates
+ type: deb
+ uri: http://10.20.6.2:8080/mirrors/ubuntu/
+ - name: ubuntu-security
+ priority: null
+ section: main universe multiverse
+ suite: trusty-security
+ type: deb
+ uri: http://10.20.6.2:8080/mirrors/ubuntu/
+ - name: mos
+ priority: 1050
+ section: main restricted
+ suite: mos9.0
+ type: deb
+ uri: http://10.20.6.2:8080/mitaka-9.0/ubuntu/x86_64
+ - name: Auxiliary
+ priority: 1150
+ section: main restricted
+ suite: auxiliary
+ type: deb
+ uri: http://10.20.6.2:8080/mitaka-9.0/ubuntu/auxiliary
diff --git a/labs/zte/pod1/fuel/config/dha.yaml b/labs/zte/pod1/fuel/config/dha.yaml
index 474cfa0..f81d06b 100644
--- a/labs/zte/pod1/fuel/config/dha.yaml
+++ b/labs/zte/pod1/fuel/config/dha.yaml
@@ -12,34 +12,35 @@ adapter: zte
nodes:
- id: 1
- pxeMac: 4c:09:b4:b2:59:87
- ipmiIp: 129.5.1.101
+ pxeMac: 74:4A:A4:00:CF:DC
+ ipmiIp: 192.168.1.101
ipmiUser: zteroot
ipmiPass: superuser
- id: 2
- pxeMac: 4c:09:b4:b2:59:fc
- ipmiIp: 129.5.1.22
+ pxeMac: 74:4A:A4:00:CE:CE
+ ipmiIp: 192.168.1.102
ipmiUser: zteroot
ipmiPass: superuser
- id: 3
- pxeMac: 4c:09:b4:b2:59:a2
- ipmiIp: 129.5.1.3
+ pxeMac: 74:4A:A4:00:CF:58
+ ipmiIp: 192.168.1.103
ipmiUser: zteroot
ipmiPass: superuser
- id: 4
- pxeMac: 4c:09:b4:b2:59:d8
- ipmiIp: 129.5.1.4
+ pxeMac: 74:4A:A4:00:49:84
+ ipmiIp: 192.168.1.104
ipmiUser: zteroot
ipmiPass: superuser
- id: 5
- pxeMac: 4c:09:b4:b2:59:75
- ipmiIp: 129.5.1.5
+ pxeMac: 74:4A:A4:00:CE:C2
+ ipmiIp: 192.168.1.105
ipmiUser: zteroot
ipmiPass: superuser
+
# Adding the Fuel node as node id 6 which may not be correct - please
# adjust as needed.
- id: 7
- libvirtName: fuel-opnfv
+ libvirtName: fuel-opnfv-1
libvirtTemplate: templates/hardware_environment/vms/fuel.xml
isFuel: yes
username: root