summaryrefslogtreecommitdiffstats
path: root/deploy/config/labs/devel-pipeline/elx
diff options
context:
space:
mode:
authorJonas Bjurel <jonas.bjurel@ericsson.com>2016-01-26 23:37:23 +0100
committerJonas Bjurel <jonas.bjurel@ericsson.com>2016-01-29 13:58:49 +0000
commit3d6ec0d08c858d55eb478f03d2b1e60f9a522981 (patch)
tree0fe6c9e7f0aaf6303bd8a8e0e98d4b28177f93ca /deploy/config/labs/devel-pipeline/elx
parent1a560c19021ff232b7869b3057af4bcc46145b40 (diff)
Rebasement of Fuel8 deployment configuration files and scenarios
Note: - Lab configurations removed - Most of the POD configuration files resides in the securedlab repo - The securedlab repo is very restricive, cause it carries Lab internal secrets TODO: - Ericsson virt is not yet rebased - Intel virt is not yet rebased - LF-POD2 is not yet rebased - Deployment scenarios for vsperf, NFVOVS, NFVKVM, ONOS, VSPERF, BGPVPN is not yet rebased NOT VERIFIED DO NOT MERGE Change-Id: I59d96acb26c06abf60c254fae8ea2ced332e5884 Signed-off-by: Jonas Bjurel <jonas.bjurel@ericsson.com> (cherry picked from commit c43ed292f38dd9d26ee1efb02f0871501aa64dc9)
Diffstat (limited to 'deploy/config/labs/devel-pipeline/elx')
-rw-r--r--deploy/config/labs/devel-pipeline/elx/fuel/config/dea-pod-override.yaml144
-rw-r--r--deploy/config/labs/devel-pipeline/elx/fuel/config/dha.yaml8
2 files changed, 73 insertions, 79 deletions
diff --git a/deploy/config/labs/devel-pipeline/elx/fuel/config/dea-pod-override.yaml b/deploy/config/labs/devel-pipeline/elx/fuel/config/dea-pod-override.yaml
index 7fc429b84..fdbe202d3 100644
--- a/deploy/config/labs/devel-pipeline/elx/fuel/config/dea-pod-override.yaml
+++ b/deploy/config/labs/devel-pipeline/elx/fuel/config/dea-pod-override.yaml
@@ -1,19 +1,19 @@
dea-pod-override-config-metadata:
title: 'Deployment Environment Adapter POD override for Development Pipeline - Ericsson ELX version'
- version: '0.1'
- created: 'Mon Dec 30 2015'
- comment: 'None'
+ version: '0.2'
+ created: 'Mon Jan 26 2016'
+ comment: 'Rebased for Fuel8'
environment:
name: opnfv_virt
interfaces_1:
- eth0:
+ ens3:
- fuelweb_admin
- management
- eth1:
+ ens4:
- storage
- eth2:
+ ens5:
- private
- eth3:
+ ens6:
- public
transformations_1:
transformations:
@@ -38,45 +38,61 @@ transformations_1:
name: br-mesh
- action: add-port
bridge: br-fw-admin
- name: eth0
+ name: ens3
- action: add-port
bridge: br-mgmt
- name: eth0.101
+ name: ens3.101
- action: add-port
bridge: br-storage
- name: eth1.102
+ name: ens4.102
- action: add-port
bridge: br-mesh
- name: eth2.103
+ name: ens5.103
- action: add-port
bridge: br-ex
- name: eth3
+ name: ens6
+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-mesh
+ - action: add-port
+ bridge: br-fw-admin
+ name: ens3
+ - action: add-port
+ bridge: br-mgmt
+ name: ens3.101
+ - action: add-port
+ bridge: br-storage
+ name: ens4.102
+ - action: add-port
+ bridge: br-mesh
+ name: ens5.103
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.se
- DNS_SEARCH: opnfvericsson.se
+ netmask: 255.255.255.0
+ DNS_DOMAIN: opnfv.org
+ DNS_SEARCH: opnfv.org
DNS_UPSTREAM: 147.214.6.234
- FUEL_ACCESS:
- password: admin
- user: admin
HOSTNAME: opnfv_virt
NTP1: 193.181.14.10
NTP2: 193.181.14.11
- NTP3: null
+ NTP3: ''
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:
- 147.214.6.234
+ floating_name: admin_floating_net
floating_ranges:
- - 172.16.0.130
- 172.16.0.254
@@ -85,6 +101,7 @@ network:
- 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:
@@ -115,6 +132,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 +169,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 +187,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 +202,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 +215,14 @@ settings:
value: 147.214.6.234
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
@@ -246,7 +234,10 @@ settings:
weight: 10
syslog:
metadata:
+ enabled: false
+ group: logging
label: Syslog
+ toggleable: true
weight: 50
syslog_port:
description: Remote syslog port
@@ -260,6 +251,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
@@ -274,4 +268,4 @@ settings:
- data: tcp
description: ''
label: TCP
- weight: 30 \ No newline at end of file
+ weight: 30
diff --git a/deploy/config/labs/devel-pipeline/elx/fuel/config/dha.yaml b/deploy/config/labs/devel-pipeline/elx/fuel/config/dha.yaml
index fc0e93a4f..6b5a30735 100644
--- a/deploy/config/labs/devel-pipeline/elx/fuel/config/dha.yaml
+++ b/deploy/config/labs/devel-pipeline/elx/fuel/config/dha.yaml
@@ -1,8 +1,8 @@
dha-pod-config-metadata:
title: Deployment Hardware Adapter (DHA) for fuel development pipeline - Ericsson ELX version
- version: 0.0.1
- created: Dececember 30 2015
- comment: ELX version
+ version: 0.0.2
+ created: Jan 26 2016
+ comment: ELX Fuel8 version
# Adapter to use for this definition
adapter: libvirt
@@ -35,4 +35,4 @@ virtNetConfDir: templates/virtual_environment/networks
disks:
fuel: 50G
controller: 100G
- compute: 50G
+ compute: 100G