From eff515985fb99f77a3ecb302f5cf0179e1593c47 Mon Sep 17 00:00:00 2001 From: Jonas Bjurel Date: Tue, 26 Jan 2016 23:46:35 +0100 Subject: 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 (cherry picked from commit fafe39b3959fb5e1ad4e0d73154abf10bf7eb7f2) --- .../default/fuel/config/dea-pod-override.yaml | 278 --------------------- labs/devel-pipeline/default/fuel/config/dha.yaml | 38 --- .../elx/fuel/config/dea-pod-override.yaml | 277 -------------------- labs/devel-pipeline/elx/fuel/config/dha.yaml | 38 --- .../pod2/fuel/config/dea-pod-override.yaml | 159 +++++++----- labs/ericsson/pod2/fuel/config/dha.yaml | 18 +- .../virtual_kvm/fuel/config/dea-pod-override.yaml | 157 ++++++------ labs/ericsson/virtual_kvm/fuel/config/dha.yaml | 2 +- 8 files changed, 197 insertions(+), 770 deletions(-) delete mode 100644 labs/devel-pipeline/default/fuel/config/dea-pod-override.yaml delete mode 100644 labs/devel-pipeline/default/fuel/config/dha.yaml delete mode 100644 labs/devel-pipeline/elx/fuel/config/dea-pod-override.yaml delete mode 100644 labs/devel-pipeline/elx/fuel/config/dha.yaml diff --git a/labs/devel-pipeline/default/fuel/config/dea-pod-override.yaml b/labs/devel-pipeline/default/fuel/config/dea-pod-override.yaml deleted file mode 100644 index 2be68e2..0000000 --- a/labs/devel-pipeline/default/fuel/config/dea-pod-override.yaml +++ /dev/null @@ -1,278 +0,0 @@ -dea-pod-override-config-metadata: - title: 'Deployment Environment Adapter POD override for Development Pipeline - Default version' - version: '0.1' - created: 'Thu 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.se - DNS_SEARCH: opnfvericsson.se - DNS_UPSTREAM: 10.118.32.193 - FUEL_ACCESS: - password: admin - user: admin - HOSTNAME: opnfv_virt - NTP1: 81.170.152.66 - NTP2: 83.168.200.199 - NTP3: 78.108.60.252 -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 - - 8.8.4.4 - 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: 8.8.8.8,8.8.4.4 - 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: 81.170.152.66,83.168.200.199,78.108.60.252 - 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/devel-pipeline/default/fuel/config/dha.yaml b/labs/devel-pipeline/default/fuel/config/dha.yaml deleted file mode 100644 index 26c4d2b..0000000 --- a/labs/devel-pipeline/default/fuel/config/dha.yaml +++ /dev/null @@ -1,38 +0,0 @@ -dha-pod-config-metadata: - title: Deployment Hardware Adapter (DHA) for fuel development pipeline - default version - version: 0.0.1 - created: Jan 7 2016 - comment: Default version - -# 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: 100G - compute: 50G diff --git a/labs/devel-pipeline/elx/fuel/config/dea-pod-override.yaml b/labs/devel-pipeline/elx/fuel/config/dea-pod-override.yaml deleted file mode 100644 index 7fc429b..0000000 --- a/labs/devel-pipeline/elx/fuel/config/dea-pod-override.yaml +++ /dev/null @@ -1,277 +0,0 @@ -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' -environment: - name: opnfv_virt -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 -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 - 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 -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_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: 147.214.6.234 - 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: 193.181.14.10, 193.181.14.11 - 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 \ No newline at end of file diff --git a/labs/devel-pipeline/elx/fuel/config/dha.yaml b/labs/devel-pipeline/elx/fuel/config/dha.yaml deleted file mode 100644 index fc0e93a..0000000 --- a/labs/devel-pipeline/elx/fuel/config/dha.yaml +++ /dev/null @@ -1,38 +0,0 @@ -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 - -# 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: 100G - compute: 50G diff --git a/labs/ericsson/pod2/fuel/config/dea-pod-override.yaml b/labs/ericsson/pod2/fuel/config/dea-pod-override.yaml index 7b0e96a..1dbc825 100644 --- a/labs/ericsson/pod2/fuel/config/dea-pod-override.yaml +++ b/labs/ericsson/pod2/fuel/config/dea-pod-override.yaml @@ -1,19 +1,19 @@ 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' + version: '0.2' + created: 'Jan 26 2016' + comment: 'Rebased for Fuel8' environment: - name: POD2-BM1-DEPLOY + name: FUEL-BM1-POD2 interfaces_1: - eth1: + eno49: - fuelweb_admin - eth2: + ens1f0: - public - management - storage - eth3: + ens1f1: - private transformations_1: transformations: @@ -38,19 +38,55 @@ transformations_1: name: br-mesh - action: add-port bridge: br-fw-admin - name: eth0 + name: eno49 - action: add-port bridge: br-mgmt - name: eth2.100 + name: ens1f0.100 - action: add-port bridge: br-storage - name: eth2.200 + name: ens1f0.200 - action: add-port bridge: br-ex - name: eth2.753 + name: ens1f0.753 - action: add-port bridge: br-mesh - name: eth3.300 + name: ens1f1.300 +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: eno49 + - action: add-port + bridge: br-mgmt + name: ens1f0.100 + - action: add-port + bridge: br-storage + name: ens1f0.200 + - action: add-port + bridge: br-ex + name: ens1f0.753 + - action: add-port + bridge: br-mesh + name: ens1f1.300 fuel: ADMIN_NETWORK: dhcp_pool_end: 10.20.0.254 @@ -60,6 +96,7 @@ fuel: DNS_DOMAIN: opnfvericsson.ca DNS_SEARCH: opnfvericsson.ca DNS_UPSTREAM: 10.118.32.193 + HOSTNAME: fuel-bm1-pod2 NTP1: 10.118.32.193 NTP2: '' NTP3: '' @@ -69,63 +106,27 @@ network: configuration_template: null dns_nameservers: - 10.118.32.193 + floating_name: admin_floating_net floating_ranges: - - - 10.118.101.132 - - 10.118.101.140 + - - 10.118.101.191 + - 10.118.101.200 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: 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 + - - 10.118.101.180 + - 10.118.101.190 meta: cidr: 172.16.0.0/24 configurable: true @@ -162,6 +163,44 @@ network: vlan_start: 102 name: storage vlan_start: 200 + - 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.20.0.0/24 gateway: 10.20.0.2 ip_ranges: @@ -190,12 +229,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 @@ -207,7 +248,10 @@ settings: weight: 10 syslog: metadata: + enabled: false + group: logging label: Syslog + toggleable: true weight: 50 syslog_port: description: Remote syslog port @@ -221,6 +265,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/pod2/fuel/config/dha.yaml b/labs/ericsson/pod2/fuel/config/dha.yaml index 408d221..f30d556 100644 --- a/labs/ericsson/pod2/fuel/config/dha.yaml +++ b/labs/ericsson/pod2/fuel/config/dha.yaml @@ -1,9 +1,9 @@ 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 + version: 0.0.2 + created: Jan 26 2016 + comment: Config for Ericsson Montreal Lab 1, POD2, Rebased for Fuel8 # Adapter to use for this definition adapter: hp @@ -14,27 +14,27 @@ adapter: hp nodes: - id: 1 - pxeMac: ec:b1:d7:a2:43:c8 + pxeMac: ec:b1:d7:a1:bd:60 ipmiIp: 10.118.120.235 ipmiUser: opnfv ipmiPass: E///@work2 - id: 2 - pxeMac: ec:b1:d7:a1:8b:d8 + pxeMac: ec:b1:d7:a2:44:a0 ipmiIp: 10.118.120.236 ipmiUser: opnfv ipmiPass: E///@work2 - id: 3 - pxeMac: ec:b1:d7:a2:44:88 + pxeMac: ec:b1:d7:a2:43:c0 ipmiIp: 10.118.120.237 ipmiUser: opnfv ipmiPass: E///@work2 - id: 4 - pxeMac: ec:b1:d7:a2:44:a8 + pxeMac: ec:b1:d7:a2:44:80 ipmiIp: 10.118.120.238 ipmiUser: opnfv ipmiPass: E///@work2 - id: 5 - pxeMac: ec:b1:d7:a1:bd:68 + pxeMac: ec:b1:d7:a1:8b:d0 ipmiIp: 10.118.120.239 ipmiUser: opnfv ipmiPass: E///@work2 @@ -46,6 +46,6 @@ nodes: password: r00tme disks: - compute: 50G + compute: 100G controller: 100G fuel: 50G 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 -- cgit 1.2.3-korg