aboutsummaryrefslogtreecommitdiffstats
path: root/labs/ericsson
diff options
context:
space:
mode:
authorJonas Bjurel <jonas.bjurel@ericsson.com>2016-06-14 14:31:08 +0200
committerJonas Bjurel <jonas.bjurel@ericsson.com>2016-06-14 15:55:58 +0200
commit2cab0f0dbe71021f5b9a3328c7c79abeb896b6ef (patch)
tree220f4606f298148f6e33d3d6398ff7f77f93b6b5 /labs/ericsson
parent2a91ec271f1858d53be9a0fde9564c024b8b339a (diff)
Fuel 9 Rebased dea-pod-overide.yaml for Intel-1 virtual deployment
and Ericsson-1 virtual deployment NOT VERIFIED DO NOT MERGE Change-Id: I643674caad64af3b89da484261044d4136061e64 Signed-off-by: Jonas Bjurel <jonas.bjurel@ericsson.com>
Diffstat (limited to 'labs/ericsson')
-rw-r--r--labs/ericsson/virtual_kvm/fuel/config/dea-pod-override.yaml158
1 files changed, 67 insertions, 91 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 bd8bb76..97e3c3f 100644
--- a/labs/ericsson/virtual_kvm/fuel/config/dea-pod-override.yaml
+++ b/labs/ericsson/virtual_kvm/fuel/config/dea-pod-override.yaml
@@ -1,26 +1,20 @@
+##############################################################################
+# Copyright (c) 2015 Ericsson AB and others.
+# stefan.k.berg@ericsson.com
+# jonas.bjurel@ericsson.com
+# 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
+##############################################################################
+
dea-pod-override-config-metadata:
title: 'Deployment Environment Adapter POD override for Ericsson-1 virtual deployment'
- version: '0.2'
- created: 'Wed Feb 27 2016'
- comment: 'Rebased for Fuel'
+ version: '0.3'
+ created: 'Wed Jun 14 2016'
+ comment: 'Rebased for Fuel 9'
environment:
- name: Fuel-virtual-kvm-ha-bl9
-fuel:
- ADMIN_NETWORK:
- dhcp_pool_end: 10.20.0.254
- dhcp_pool_start: 10.20.0.3
- ipaddress: 10.20.0.2
- 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: fuel-virt-kvm
- NTP1: 10.118.32.193
- NTP2: ''
- NTP3: ''
+ name: opnfv_virt
interfaces_1:
ens3:
- fuelweb_admin
@@ -57,42 +51,6 @@ transformations_1:
name: ens3
- action: add-port
bridge: br-mgmt
- name: ens4.101
- - action: add-port
- bridge: br-storage
- name: ens5.102
- - action: add-port
- bridge: br-mesh
- name: ens5.103
- - action: add-port
- bridge: br-ex
- 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-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: ens3
- - action: add-port
- bridge: br-mgmt
name: ens3.101
- action: add-port
bridge: br-storage
@@ -103,6 +61,20 @@ transformations_2:
- action: add-port
bridge: br-ex
name: ens6
+fuel:
+ ADMIN_NETWORK:
+ dhcp_pool_end: 10.20.0.254
+ dhcp_pool_start: 10.20.0.3
+ ipaddress: 10.20.0.2
+ netmask: 255.255.255.0
+ ssh_network: 10.20.0.0/24
+ DNS_DOMAIN: bl9.pod1.opnfvericsson.ca
+ DNS_SEARCH: opnfvericsson.ca
+ DNS_UPSTREAM: 10.118.32.193
+ HOSTNAME: fuel
+ NTP1: 10.118.32.193
+ NTP2: ''
+ NTP3: ''
network:
networking_parameters:
base_mac: fa:16:3e:00:00:00
@@ -125,30 +97,6 @@ network:
- 1000
- 1030
networks:
- - cidr: 172.16.0.0/24
- gateway: 172.16.0.1
- ip_ranges:
- - - 172.16.0.2
- - 172.16.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: null
- cidr: 192.168.1.0/24
gateway: null
ip_ranges:
@@ -204,8 +152,32 @@ network:
vlan_start: 103
name: private
vlan_start: 103
+ - cidr: 172.16.0.0/24
+ gateway: 172.16.0.1
+ ip_ranges:
+ - - 172.16.0.2
+ - 172.16.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: null
- cidr: 10.20.0.0/24
- gateway: 10.20.0.1
+ gateway: 10.20.0.2
ip_ranges:
- - 10.20.0.3
- 10.20.0.254
@@ -223,13 +195,15 @@ settings:
editable:
external_dns:
dns_list:
- description: List of upstream DNS servers, separated by comma
+ description: List of upstream DNS servers
label: DNS list
+ max: 3
regex:
- 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: 10.118.32.193
+ error: Invalid IP address
+ source: ^(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])$
+ type: text_list
+ value:
+ - 10.118.32.193
weight: 10
metadata:
group: network
@@ -241,13 +215,14 @@ settings:
label: Host OS NTP Servers
weight: 40
ntp_list:
- description: List of upstream NTP servers, separated by comma
+ description: List of upstream NTP servers
label: NTP server list
regex:
- 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.118.32.193
+ error: Invalid NTP server
+ source: ^[a-zA-Z\d]+[-\.\da-zA-Z]*$
+ type: text_list
+ value:
+ - 10.118.32.193
weight: 10
syslog:
metadata:
@@ -286,3 +261,4 @@ settings:
description: ''
label: TCP
weight: 30
+