aboutsummaryrefslogtreecommitdiffstats
path: root/labs/ericsson
diff options
context:
space:
mode:
authorJonas Bjurel <jonas.bjurel@ericsson.com>2015-12-06 20:47:08 +0100
committerJonas Bjurel <jonas.bjurel@ericsson.com>2016-01-08 12:37:40 +0100
commit01686867da5d35dc5fb555d4936a1448aa19a52e (patch)
tree1400b93df935fdc6441b4dbdfeda82c621f5335c /labs/ericsson
parent50c2e074c8aeade1017a12ba21161b7cfef32e4b (diff)
Proposal for common OPNFV CI/CD Configuration structure
This patch provides a common configuration structure, providing separation of concern between: 1) Base installer configuration 2) Per Lab/POD specific configuration 3) Per installer feature/plugin configuration 4) Deployment scenario configuration. It is not yet aligned across installers - but provides a structure for future alignment. It relates to the implementation provided here: https://gerrit.opnfv.org/gerrit/#/c/3995/ Also see the README file VERIFIED READY TO MERGE JIRA: Change-Id: I852376ba4b500cc50cba6cb3c2634533fc6426a6 Signed-off-by: Jonas Bjurel <jonas.bjurel@ericsson.com>
Diffstat (limited to 'labs/ericsson')
-rw-r--r--labs/ericsson/pod1/common/scripts/.gitkeep0
-rw-r--r--labs/ericsson/pod1/fuel/config/.gitkeep0
-rw-r--r--labs/ericsson/pod1/fuel/scripts/.gitkeep0
-rw-r--r--labs/ericsson/pod2/fuel/config/dea-pod-override.yaml238
-rw-r--r--labs/ericsson/pod2/fuel/config/dha.yaml51
-rw-r--r--labs/ericsson/virtual_kvm/common/scripts/.gitkeep0
-rw-r--r--labs/ericsson/virtual_kvm/fuel/config/dea-pod-override.yaml277
-rw-r--r--labs/ericsson/virtual_kvm/fuel/config/dha.yaml38
-rw-r--r--labs/ericsson/virtual_kvm/fuel/scripts/.gitkeep0
9 files changed, 604 insertions, 0 deletions
diff --git a/labs/ericsson/pod1/common/scripts/.gitkeep b/labs/ericsson/pod1/common/scripts/.gitkeep
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/labs/ericsson/pod1/common/scripts/.gitkeep
diff --git a/labs/ericsson/pod1/fuel/config/.gitkeep b/labs/ericsson/pod1/fuel/config/.gitkeep
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/labs/ericsson/pod1/fuel/config/.gitkeep
diff --git a/labs/ericsson/pod1/fuel/scripts/.gitkeep b/labs/ericsson/pod1/fuel/scripts/.gitkeep
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/labs/ericsson/pod1/fuel/scripts/.gitkeep
diff --git a/labs/ericsson/pod2/fuel/config/dea-pod-override.yaml b/labs/ericsson/pod2/fuel/config/dea-pod-override.yaml
new file mode 100644
index 0000000..7b0e96a
--- /dev/null
+++ b/labs/ericsson/pod2/fuel/config/dea-pod-override.yaml
@@ -0,0 +1,238 @@
+dea-pod-override-config-metadata:
+ title: 'Deployment Environment Adapter POD override for Ericsson-1, POD-2'
+# DEA API version supported
+ version: '0.1'
+ created: 'Mon Dec 28 2015'
+ comment: 'None'
+environment:
+ name: POD2-BM1-DEPLOY
+interfaces_1:
+ eth1:
+ - fuelweb_admin
+ eth2:
+ - public
+ - management
+ - storage
+ eth3:
+ - private
+transformations_1:
+ 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: eth2.100
+ - action: add-port
+ bridge: br-storage
+ name: eth2.200
+ - action: add-port
+ bridge: br-ex
+ name: eth2.753
+ - action: add-port
+ bridge: br-mesh
+ name: eth3.300
+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: opnfvericsson.ca
+ DNS_SEARCH: opnfvericsson.ca
+ DNS_UPSTREAM: 10.118.32.193
+ NTP1: 10.118.32.193
+ NTP2: ''
+ NTP3: ''
+network:
+ networking_parameters:
+ base_mac: fa:16:3e:00:00:00
+ configuration_template: null
+ dns_nameservers:
+ - 10.118.32.193
+ floating_ranges:
+ - - 10.118.101.132
+ - 10.118.101.140
+ gre_id_range:
+ - 2
+ - 65535
+ internal_cidr: 192.168.111.0/24
+ internal_gateway: 192.168.111.1
+ net_l23_provider: ovs
+ segmentation_type: tun
+ vlan_range:
+ - 1000
+ - 1030
+ networks:
+ - cidr: 192.168.10.0/24
+ gateway: null
+ ip_ranges:
+ - - 192.168.10.1
+ - 192.168.10.254
+ meta:
+ cidr: 192.168.0.0/24
+ configurable: true
+ map_priority: 2
+ name: management
+ notation: cidr
+ render_addr_mask: internal
+ render_type: cidr
+ use_gateway: false
+ vips:
+ - haproxy
+ - vrouter
+ vlan_start: 101
+ name: management
+ vlan_start: 100
+ - cidr: 192.168.30.0/24
+ gateway: null
+ ip_ranges:
+ - - 192.168.30.1
+ - 192.168.30.254
+ meta:
+ cidr: 192.168.2.0/24
+ configurable: true
+ map_priority: 2
+ name: private
+ notation: cidr
+ render_addr_mask: null
+ render_type: cidr
+ seg_type: tun
+ use_gateway: false
+ vlan_start: 103
+ name: private
+ vlan_start: 300
+ - cidr: 10.118.101.0/24
+ gateway: 10.118.101.1
+ ip_ranges:
+ - - 10.118.101.122
+ - 10.118.101.131
+ 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: 753
+ - cidr: 192.168.20.0/24
+ gateway: null
+ ip_ranges:
+ - - 192.168.20.1
+ - 192.168.20.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: 200
+ - cidr: 10.20.0.0/24
+ gateway: 10.20.0.2
+ ip_ranges:
+ - - 10.20.0.3
+ - 10.20.0.254
+ meta:
+ configurable: false
+ map_priority: 0
+ notation: ip_ranges
+ render_addr_mask: null
+ render_type: null
+ unmovable: true
+ use_gateway: true
+ name: fuelweb_admin
+ vlan_start: null
+settings:
+ editable:
+ external_dns:
+ dns_list:
+ description: List of upstream DNS servers, separated by comma
+ label: DNS list
+ 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
+ weight: 10
+ metadata:
+ label: Host OS DNS Servers
+ weight: 90
+ external_ntp:
+ metadata:
+ label: Host OS NTP Servers
+ weight: 100
+ ntp_list:
+ description: List of upstream NTP servers, separated by comma
+ 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
+ weight: 10
+ syslog:
+ metadata:
+ label: Syslog
+ weight: 50
+ syslog_port:
+ description: Remote syslog port
+ label: Port
+ regex:
+ error: Invalid syslog port
+ source: ^([1-9][0-9]{0,3}|[1-5][0-9]{4}|6[0-4][0-9]{3}|65[0-4][0-9]{2}|655[0-2][0-9]|6553[0-5])$
+ type: text
+ value: '514'
+ weight: 20
+ syslog_server:
+ description: Remote syslog hostname
+ label: Hostname
+ type: text
+ value: ''
+ weight: 10
+ syslog_transport:
+ label: Syslog transport protocol
+ type: radio
+ value: tcp
+ values:
+ - data: udp
+ description: ''
+ label: UDP
+ - data: tcp
+ description: ''
+ label: TCP
+ weight: 30
diff --git a/labs/ericsson/pod2/fuel/config/dha.yaml b/labs/ericsson/pod2/fuel/config/dha.yaml
new file mode 100644
index 0000000..408d221
--- /dev/null
+++ b/labs/ericsson/pod2/fuel/config/dha.yaml
@@ -0,0 +1,51 @@
+dha-pod-config-metadata:
+ title: Deployment Hardware Adapter (DHA) for Ericsson-1, POD-2
+# DHA API version supported
+ version: 0.0.1
+ created: Dececember 29 2015
+ comment: Config for Ericsson Montreal Lab 1, POD2
+
+# Adapter to use for this definition
+adapter: hp
+
+# Node list.
+# Mandatory properties are id and role.
+
+nodes:
+
+- id: 1
+ pxeMac: ec:b1:d7:a2:43:c8
+ ipmiIp: 10.118.120.235
+ ipmiUser: opnfv
+ ipmiPass: E///@work2
+- id: 2
+ pxeMac: ec:b1:d7:a1:8b:d8
+ ipmiIp: 10.118.120.236
+ ipmiUser: opnfv
+ ipmiPass: E///@work2
+- id: 3
+ pxeMac: ec:b1:d7:a2:44:88
+ ipmiIp: 10.118.120.237
+ ipmiUser: opnfv
+ ipmiPass: E///@work2
+- id: 4
+ pxeMac: ec:b1:d7:a2:44:a8
+ ipmiIp: 10.118.120.238
+ ipmiUser: opnfv
+ ipmiPass: E///@work2
+- id: 5
+ pxeMac: ec:b1:d7:a1:bd:68
+ ipmiIp: 10.118.120.239
+ ipmiUser: opnfv
+ ipmiPass: E///@work2
+- id: 6
+ libvirtName: fuel-opnfv
+ libvirtTemplate: templates/hardware_environment/vms/ericsson_montreal_lab/fuel.xml
+ isFuel: yes
+ username: root
+ password: r00tme
+
+disks:
+ compute: 50G
+ controller: 100G
+ fuel: 50G
diff --git a/labs/ericsson/virtual_kvm/common/scripts/.gitkeep b/labs/ericsson/virtual_kvm/common/scripts/.gitkeep
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/labs/ericsson/virtual_kvm/common/scripts/.gitkeep
diff --git a/labs/ericsson/virtual_kvm/fuel/config/dea-pod-override.yaml b/labs/ericsson/virtual_kvm/fuel/config/dea-pod-override.yaml
new file mode 100644
index 0000000..4813fd2
--- /dev/null
+++ b/labs/ericsson/virtual_kvm/fuel/config/dea-pod-override.yaml
@@ -0,0 +1,277 @@
+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'
+environment:
+ name: opnfv_virt
+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
+ 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
+interfaces_1:
+ eth0:
+ - fuelweb_admin
+ - management
+ eth1:
+ - storage
+ eth2:
+ - private
+ eth3:
+ - public
+transformations_1:
+ 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
+ floating_ranges:
+ - - 172.16.0.130
+ - 172.16.0.254
+ gre_id_range:
+ - 2
+ - 65535
+ internal_cidr: 192.168.111.0/24
+ internal_gateway: 192.168.111.1
+ net_l23_provider: ovs
+ segmentation_type: tun
+ vlan_range:
+ - 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.0.0/24
+ gateway: null
+ ip_ranges:
+ - - 192.168.0.1
+ - 192.168.0.254
+ meta:
+ cidr: 192.168.0.0/24
+ configurable: true
+ map_priority: 2
+ name: management
+ notation: cidr
+ render_addr_mask: internal
+ render_type: cidr
+ use_gateway: false
+ vips:
+ - haproxy
+ - vrouter
+ 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:
+ - - 192.168.2.1
+ - 192.168.2.254
+ meta:
+ cidr: 192.168.2.0/24
+ configurable: true
+ map_priority: 2
+ name: private
+ notation: cidr
+ render_addr_mask: null
+ render_type: cidr
+ seg_type: tun
+ use_gateway: false
+ vlan_start: 103
+ name: private
+ vlan_start: 103
+ - cidr: 10.20.0.0/16
+ gateway: 10.20.0.2
+ ip_ranges:
+ - - 10.20.0.3
+ - 10.20.0.254
+ meta:
+ configurable: false
+ map_priority: 0
+ notation: ip_ranges
+ render_addr_mask: null
+ render_type: null
+ unmovable: true
+ 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:
+ dns_list:
+ description: List of upstream DNS servers, separated by comma
+ label: DNS list
+ 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
+ weight: 10
+ metadata:
+ label: Host OS DNS Servers
+ weight: 90
+ external_ntp:
+ metadata:
+ label: Host OS NTP Servers
+ weight: 100
+ ntp_list:
+ description: List of upstream NTP servers, separated by comma
+ 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.20.0.253, 10.118.32.193, 10.118.34.193
+ weight: 10
+ syslog:
+ metadata:
+ label: Syslog
+ weight: 50
+ syslog_port:
+ description: Remote syslog port
+ label: Port
+ regex:
+ error: Invalid syslog port
+ source: ^([1-9][0-9]{0,3}|[1-5][0-9]{4}|6[0-4][0-9]{3}|65[0-4][0-9]{2}|655[0-2][0-9]|6553[0-5])$
+ type: text
+ value: '514'
+ weight: 20
+ syslog_server:
+ description: Remote syslog hostname
+ label: Hostname
+ type: text
+ value: ''
+ weight: 10
+ syslog_transport:
+ label: Syslog transport protocol
+ type: radio
+ value: tcp
+ values:
+ - data: udp
+ description: ''
+ label: UDP
+ - data: tcp
+ description: ''
+ label: TCP
+ weight: 30
diff --git a/labs/ericsson/virtual_kvm/fuel/config/dha.yaml b/labs/ericsson/virtual_kvm/fuel/config/dha.yaml
new file mode 100644
index 0000000..6d476b8
--- /dev/null
+++ b/labs/ericsson/virtual_kvm/fuel/config/dha.yaml
@@ -0,0 +1,38 @@
+title: Deployment Hardware Adapter (DHA)
+# DHA API version supported
+version:
+created:
+comment: Config for Virtual Environment
+
+# Adapter to use for this definition
+adapter: libvirt
+
+# Node list.
+# Mandatory property is id, all other properties are adapter specific.
+
+nodes:
+- id: 1
+ libvirtName: controller1
+ libvirtTemplate: templates/virtual_environment/vms/controller.xml
+- id: 2
+ libvirtName: compute1
+ libvirtTemplate: templates/virtual_environment/vms/compute.xml
+- id: 3
+ libvirtName: compute2
+ libvirtTemplate: templates/virtual_environment/vms/compute.xml
+- id: 4
+ libvirtName: compute3
+ libvirtTemplate: templates/virtual_environment/vms/compute.xml
+- id: 5
+ libvirtName: fuel-master
+ libvirtTemplate: templates/virtual_environment/vms/fuel.xml
+ isFuel: yes
+ username: root
+ password: r00tme
+
+virtNetConfDir: templates/virtual_environment/networks
+
+disks:
+ fuel: 50G
+ controller: 50G
+ compute: 50G
diff --git a/labs/ericsson/virtual_kvm/fuel/scripts/.gitkeep b/labs/ericsson/virtual_kvm/fuel/scripts/.gitkeep
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/labs/ericsson/virtual_kvm/fuel/scripts/.gitkeep