aboutsummaryrefslogtreecommitdiffstats
path: root/labs/ericsson/virtual_kvm
diff options
context:
space:
mode:
authorJonas Bjurel <jonas.bjurel@ericsson.com>2016-01-26 23:46:35 +0100
committerJonas Bjurel <jonas.bjurel@ericsson.com>2016-01-27 13:28:37 +0100
commitfafe39b3959fb5e1ad4e0d73154abf10bf7eb7f2 (patch)
tree44daea27a35572df49e042a2aefb31f50c02f469 /labs/ericsson/virtual_kvm
parentcd1e746225d5575a727869071e03d8670975ad01 (diff)
Rebasement of Fuel8 deployment configuration files and scenarios
Note: - Most of the POD configuration files resides in the securedlab repo - The securedlab repo is very restricive, cause it carries Lab internal secrets TODO: - Intel virt is not yet rebased - LF-POD2 is not yet rebased NOT VERIFIED DO NOT MERGE Change-Id: I1be01a374bff65e3bee708ef00727cf1e94cb0af Signed-off-by: Jonas Bjurel <jonas.bjurel@ericsson.com>
Diffstat (limited to 'labs/ericsson/virtual_kvm')
-rw-r--r--labs/ericsson/virtual_kvm/fuel/config/dea-pod-override.yaml157
-rw-r--r--labs/ericsson/virtual_kvm/fuel/config/dha.yaml2
2 files changed, 85 insertions, 74 deletions
diff --git a/labs/ericsson/virtual_kvm/fuel/config/dea-pod-override.yaml b/labs/ericsson/virtual_kvm/fuel/config/dea-pod-override.yaml
index 4813fd2..b7f2b50 100644
--- a/labs/ericsson/virtual_kvm/fuel/config/dea-pod-override.yaml
+++ b/labs/ericsson/virtual_kvm/fuel/config/dea-pod-override.yaml
@@ -1,28 +1,26 @@
dea-pod-override-config-metadata:
title: 'Deployment Environment Adapter POD override for Ericsson-1 virtual deployment'
- version: '0.1'
- created: 'Thu Jan 7 2016'
- comment: 'None'
+ version: '0.2'
+ created: 'Wed Feb 27 2016'
+ comment: 'Rebased for Fuel'
environment:
- name: opnfv_virt
+ name: Fuel-virtual-kvm-ha-bl9
fuel:
ADMIN_NETWORK:
- cidr: 10.20.0.0/24
- dhcp_gateway: 10.20.0.2
dhcp_pool_end: 10.20.0.254
dhcp_pool_start: 10.20.0.3
ipaddress: 10.20.0.2
- netmask: 255.255.0.0
- DNS_DOMAIN: opnfvericsson.ca
+ netmask: 255.255.255.0
+ DNS_DOMAIN: bl9.pod1.opnfvericsson.ca
DNS_SEARCH: opnfvericsson.ca
DNS_UPSTREAM: 10.118.32.193
FUEL_ACCESS:
password: admin
user: admin
- HOSTNAME: opnfv_virt
- NTP1: 10.20.0.253
- NTP2: 10.118.32.193
- NTP3: 10.118.34.193
+ HOSTNAME: fuel-virt-kvm
+ NTP1: 10.118.32.193
+ NTP2: ''
+ NTP3: ''
interfaces_1:
eth0:
- fuelweb_admin
@@ -69,33 +67,69 @@ transformations_1:
- action: add-port
bridge: br-ex
name: eth3
+transformations_2:
+ transformations:
+ - action: add-br
+ name: br-fw-admin
+ - action: add-br
+ name: br-mgmt
+ - action: add-br
+ name: br-storage
+ - action: add-br
+ name: br-ex
+ - action: add-br
+ name: br-floating
+ provider: ovs
+ - action: add-patch
+ bridges:
+ - br-floating
+ - br-ex
+ mtu: 65000
+ provider: ovs
+ - action: add-br
+ name: br-mesh
+ - action: add-port
+ bridge: br-fw-admin
+ name: eth0
+ - action: add-port
+ bridge: br-mgmt
+ name: eth0.101
+ - action: add-port
+ bridge: br-storage
+ name: eth1.102
+ - action: add-port
+ bridge: br-mesh
+ name: eth2.103
+ - action: add-port
+ bridge: br-ex
+ name: eth3
network:
- management_vip: 192.168.0.2
- management_vrouter_vip: 192.168.0.1
networking_parameters:
base_mac: fa:16:3e:00:00:00
configuration_template: null
dns_nameservers:
- - 8.8.8.8
+ - 10.118.32.193
+ floating_name: admin_floating_net
floating_ranges:
- - - 172.16.0.130
- - 172.16.0.254
+ - - 172.16.100.130
+ - 172.16.100.254
gre_id_range:
- 2
- 65535
internal_cidr: 192.168.111.0/24
internal_gateway: 192.168.111.1
+ internal_name: admin_internal_net
net_l23_provider: ovs
segmentation_type: tun
vlan_range:
- 1000
- 1030
networks:
- - cidr: 172.16.0.0/24
- gateway: 172.16.0.1
+ - cidr: 172.16.100.0/24
+ gateway: 172.16.100.1
ip_ranges:
- - - 172.16.0.2
- - 172.16.0.126
+ - - 172.16.100.2
+ - 172.16.100.126
meta:
cidr: 172.16.0.0/24
configurable: true
@@ -115,6 +149,23 @@ network:
vlan_start: null
name: public
vlan_start: null
+ - cidr: 192.168.1.0/24
+ gateway: null
+ ip_ranges:
+ - - 192.168.1.1
+ - 192.168.1.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.0.0/24
gateway: null
ip_ranges:
@@ -135,23 +186,6 @@ network:
vlan_start: 101
name: management
vlan_start: 101
- - cidr: 192.168.1.0/24
- gateway: null
- ip_ranges:
- - - 192.168.1.1
- - 192.168.1.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.2.0/24
gateway: null
ip_ranges:
@@ -170,7 +204,7 @@ network:
vlan_start: 103
name: private
vlan_start: 103
- - cidr: 10.20.0.0/16
+ - cidr: 10.20.0.0/24
gateway: 10.20.0.2
ip_ranges:
- - 10.20.0.3
@@ -185,37 +219,6 @@ network:
use_gateway: true
name: fuelweb_admin
vlan_start: null
- public_vip: 172.16.0.3
- public_vrouter_vip: 172.16.0.2
- vips:
- management:
- ipaddr: 192.168.0.2
- namespace: haproxy
- network_role: mgmt/vip
- node_roles:
- - controller
- - primary-controller
- public:
- ipaddr: 172.16.0.3
- namespace: haproxy
- network_role: public/vip
- node_roles:
- - controller
- - primary-controller
- vrouter:
- ipaddr: 192.168.0.1
- namespace: vrouter
- network_role: mgmt/vip
- node_roles:
- - controller
- - primary-controller
- vrouter_pub:
- ipaddr: 172.16.0.2
- namespace: vrouter
- network_role: public/vip
- node_roles:
- - controller
- - primary-controller
settings:
editable:
external_dns:
@@ -229,12 +232,14 @@ settings:
value: 10.118.32.193
weight: 10
metadata:
+ group: network
label: Host OS DNS Servers
- weight: 90
+ weight: 30
external_ntp:
metadata:
+ group: network
label: Host OS NTP Servers
- weight: 100
+ weight: 40
ntp_list:
description: List of upstream NTP servers, separated by comma
label: NTP server list
@@ -242,11 +247,14 @@ 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.253, 10.118.32.193, 10.118.34.193
+ value: 10.118.32.193
weight: 10
syslog:
metadata:
+ enabled: false
+ group: logging
label: Syslog
+ toggleable: true
weight: 50
syslog_port:
description: Remote syslog port
@@ -260,6 +268,9 @@ settings:
syslog_server:
description: Remote syslog hostname
label: Hostname
+ regex:
+ error: Invalid hostname
+ source: ^[a-zA-Z\d]+[-\.\da-zA-Z]*$
type: text
value: ''
weight: 10
diff --git a/labs/ericsson/virtual_kvm/fuel/config/dha.yaml b/labs/ericsson/virtual_kvm/fuel/config/dha.yaml
index 92a9bba..5bdd71a 100644
--- a/labs/ericsson/virtual_kvm/fuel/config/dha.yaml
+++ b/labs/ericsson/virtual_kvm/fuel/config/dha.yaml
@@ -35,4 +35,4 @@ virtNetConfDir: templates/virtual_environment/networks
disks:
fuel: 50G
controller: 100G
- compute: 50G
+ compute: 100G