From 52a9599828cf6aaae1bdcc60e1a6cf079567e8f6 Mon Sep 17 00:00:00 2001 From: Fatih Degirmenci Date: Tue, 12 Jan 2016 22:33:54 +0100 Subject: Use small-caps in LF lab name Change-Id: I293b72d3118f1065982c8a417d9a81f705e584fc Signed-off-by: Fatih Degirmenci --- labs/LF/pod2/fuel/config/dea-pod-override.yaml | 276 ------------------------- labs/LF/pod2/fuel/config/dha.yaml | 50 ----- labs/LF/virtual_kvm/common/scripts/.gitkeep | 0 labs/LF/virtual_kvm/fuel/scripts/.gitkeep | 0 labs/lf/pod2/fuel/config/dea-pod-override.yaml | 276 +++++++++++++++++++++++++ labs/lf/pod2/fuel/config/dha.yaml | 50 +++++ labs/lf/virtual_kvm/common/scripts/.gitkeep | 0 labs/lf/virtual_kvm/fuel/scripts/.gitkeep | 0 8 files changed, 326 insertions(+), 326 deletions(-) delete mode 100644 labs/LF/pod2/fuel/config/dea-pod-override.yaml delete mode 100644 labs/LF/pod2/fuel/config/dha.yaml delete mode 100644 labs/LF/virtual_kvm/common/scripts/.gitkeep delete mode 100644 labs/LF/virtual_kvm/fuel/scripts/.gitkeep create mode 100644 labs/lf/pod2/fuel/config/dea-pod-override.yaml create mode 100644 labs/lf/pod2/fuel/config/dha.yaml create mode 100644 labs/lf/virtual_kvm/common/scripts/.gitkeep create mode 100644 labs/lf/virtual_kvm/fuel/scripts/.gitkeep diff --git a/labs/LF/pod2/fuel/config/dea-pod-override.yaml b/labs/LF/pod2/fuel/config/dea-pod-override.yaml deleted file mode 100644 index 4e67890..0000000 --- a/labs/LF/pod2/fuel/config/dea-pod-override.yaml +++ /dev/null @@ -1,276 +0,0 @@ -dea-pod-override-config-metadata: - title: 'Deployment Environment Adapter POD override for LF, POD2' - version: '0.1' - created: 'Tue Jan 12 2016' - comment: 'Config for LF POD2' -environment: - name: opnfv -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: domain.tld - DNS_SEARCH: domain.tld - DNS_UPSTREAM: 8.8.8.8 - FUEL_ACCESS: - password: admin - user: admin - HOSTNAME: opnfv - NTP1: 0.pool.ntp.org - NTP2: 1.pool.ntp.org - NTP3: 2.pool.ntp.org -interfaces_1: - eth0: - - fuelweb_admin - - management - - storage - - private - eth2: - - 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.300 - - action: add-port - bridge: br-storage - name: eth0.301 - - action: add-port - bridge: br-mesh - name: eth0.302 - - action: add-port - bridge: br-ex - name: eth2 -network: - management_vip: 192.168.1.2 - management_vrouter_vip: 192.168.1.1 - networking_parameters: - base_mac: fa:16:3e:00:00:00 - configuration_template: null - dns_nameservers: - - 8.8.4.4 - - 8.8.8.8 - floating_ranges: - - - 172.30.10.160 - - 172.30.10.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.30.10.0/24 - gateway: 172.30.10.1 - ip_ranges: - - - 172.30.10.64 - - 172.30.10.159 - 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: - - - 192.168.1.1 - - 192.168.1.254 - meta: - cidr: 192.168.1.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: 300 - - 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: storage - notation: cidr - render_addr_mask: storage - render_type: cidr - use_gateway: false - vlan_start: 102 - name: storage - vlan_start: 301 - - 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: 302 - - 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.30.10.64 - public_vrouter_vip: 172.30.10.65 - vips: - management: - ipaddr: 192.168.1.2 - namespace: haproxy - network_role: mgmt/vip - node_roles: - - controller - - primary-controller - public: - ipaddr: 172.30.10.64 - namespace: haproxy - network_role: public/vip - node_roles: - - controller - - primary-controller - vrouter: - ipaddr: 192.168.1.1 - namespace: vrouter - network_role: mgmt/vip - node_roles: - - controller - - primary-controller - vrouter_pub: - ipaddr: 172.30.10.65 - 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: 0.pool.ntp.org, 1.pool.ntp.org, 2.pool.ntp.org - 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/LF/pod2/fuel/config/dha.yaml b/labs/LF/pod2/fuel/config/dha.yaml deleted file mode 100644 index 1250f1c..0000000 --- a/labs/LF/pod2/fuel/config/dha.yaml +++ /dev/null @@ -1,50 +0,0 @@ -dha-pod-config-metadata: - title: Deployment Hardware Adapter (DHA) for LF, POD-2 -# DHA API version supported - version: 0.0.1 - created: Jan 12 2016 - comment: Config for LF, POD2 - -# Adapter to use for this definition -adapter: ipmi - -# Node list. -# Mandatory property is id, all other properties are adapter specific. - -nodes: -- id: 1 - pxeMac: 00:25:b5:a0:00:2a - ipmiIp: 172.30.8.75 - ipmiUser: admin - ipmiPass: octopus -- id: 2 - pxeMac: 00:25:b5:a0:00:3a - ipmiIp: 172.30.8.65 - ipmiUser: admin - ipmiPass: octopus -- id: 3 - pxeMac: 00:25:b5:a0:00:4a - ipmiIp: 172.30.8.74 - ipmiUser: admin - ipmiPass: octopus -- id: 4 - pxeMac: 00:25:b5:a0:00:5a - ipmiIp: 172.30.8.73 - ipmiUser: admin - ipmiPass: octopus -- id: 5 - pxeMac: 00:25:b5:a0:00:6a - ipmiIp: 172.30.8.72 - ipmiUser: admin - ipmiPass: octopus -# Adding the Fuel node as node id 6 which may not be correct - please -# adjust as needed. -- id: 6 - libvirtName: fuel-opnfv - libvirtTemplate: templates/hardware_environment/vms/fuel.xml - isFuel: yes - username: root - password: r00tme - -disks: - fuel: 50G \ No newline at end of file diff --git a/labs/LF/virtual_kvm/common/scripts/.gitkeep b/labs/LF/virtual_kvm/common/scripts/.gitkeep deleted file mode 100644 index e69de29..0000000 diff --git a/labs/LF/virtual_kvm/fuel/scripts/.gitkeep b/labs/LF/virtual_kvm/fuel/scripts/.gitkeep deleted file mode 100644 index e69de29..0000000 diff --git a/labs/lf/pod2/fuel/config/dea-pod-override.yaml b/labs/lf/pod2/fuel/config/dea-pod-override.yaml new file mode 100644 index 0000000..4e67890 --- /dev/null +++ b/labs/lf/pod2/fuel/config/dea-pod-override.yaml @@ -0,0 +1,276 @@ +dea-pod-override-config-metadata: + title: 'Deployment Environment Adapter POD override for LF, POD2' + version: '0.1' + created: 'Tue Jan 12 2016' + comment: 'Config for LF POD2' +environment: + name: opnfv +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: domain.tld + DNS_SEARCH: domain.tld + DNS_UPSTREAM: 8.8.8.8 + FUEL_ACCESS: + password: admin + user: admin + HOSTNAME: opnfv + NTP1: 0.pool.ntp.org + NTP2: 1.pool.ntp.org + NTP3: 2.pool.ntp.org +interfaces_1: + eth0: + - fuelweb_admin + - management + - storage + - private + eth2: + - 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.300 + - action: add-port + bridge: br-storage + name: eth0.301 + - action: add-port + bridge: br-mesh + name: eth0.302 + - action: add-port + bridge: br-ex + name: eth2 +network: + management_vip: 192.168.1.2 + management_vrouter_vip: 192.168.1.1 + networking_parameters: + base_mac: fa:16:3e:00:00:00 + configuration_template: null + dns_nameservers: + - 8.8.4.4 + - 8.8.8.8 + floating_ranges: + - - 172.30.10.160 + - 172.30.10.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.30.10.0/24 + gateway: 172.30.10.1 + ip_ranges: + - - 172.30.10.64 + - 172.30.10.159 + 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: + - - 192.168.1.1 + - 192.168.1.254 + meta: + cidr: 192.168.1.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: 300 + - 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: storage + notation: cidr + render_addr_mask: storage + render_type: cidr + use_gateway: false + vlan_start: 102 + name: storage + vlan_start: 301 + - 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: 302 + - 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.30.10.64 + public_vrouter_vip: 172.30.10.65 + vips: + management: + ipaddr: 192.168.1.2 + namespace: haproxy + network_role: mgmt/vip + node_roles: + - controller + - primary-controller + public: + ipaddr: 172.30.10.64 + namespace: haproxy + network_role: public/vip + node_roles: + - controller + - primary-controller + vrouter: + ipaddr: 192.168.1.1 + namespace: vrouter + network_role: mgmt/vip + node_roles: + - controller + - primary-controller + vrouter_pub: + ipaddr: 172.30.10.65 + 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: 0.pool.ntp.org, 1.pool.ntp.org, 2.pool.ntp.org + 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/lf/pod2/fuel/config/dha.yaml b/labs/lf/pod2/fuel/config/dha.yaml new file mode 100644 index 0000000..1250f1c --- /dev/null +++ b/labs/lf/pod2/fuel/config/dha.yaml @@ -0,0 +1,50 @@ +dha-pod-config-metadata: + title: Deployment Hardware Adapter (DHA) for LF, POD-2 +# DHA API version supported + version: 0.0.1 + created: Jan 12 2016 + comment: Config for LF, POD2 + +# Adapter to use for this definition +adapter: ipmi + +# Node list. +# Mandatory property is id, all other properties are adapter specific. + +nodes: +- id: 1 + pxeMac: 00:25:b5:a0:00:2a + ipmiIp: 172.30.8.75 + ipmiUser: admin + ipmiPass: octopus +- id: 2 + pxeMac: 00:25:b5:a0:00:3a + ipmiIp: 172.30.8.65 + ipmiUser: admin + ipmiPass: octopus +- id: 3 + pxeMac: 00:25:b5:a0:00:4a + ipmiIp: 172.30.8.74 + ipmiUser: admin + ipmiPass: octopus +- id: 4 + pxeMac: 00:25:b5:a0:00:5a + ipmiIp: 172.30.8.73 + ipmiUser: admin + ipmiPass: octopus +- id: 5 + pxeMac: 00:25:b5:a0:00:6a + ipmiIp: 172.30.8.72 + ipmiUser: admin + ipmiPass: octopus +# Adding the Fuel node as node id 6 which may not be correct - please +# adjust as needed. +- id: 6 + libvirtName: fuel-opnfv + libvirtTemplate: templates/hardware_environment/vms/fuel.xml + isFuel: yes + username: root + password: r00tme + +disks: + fuel: 50G \ No newline at end of file diff --git a/labs/lf/virtual_kvm/common/scripts/.gitkeep b/labs/lf/virtual_kvm/common/scripts/.gitkeep new file mode 100644 index 0000000..e69de29 diff --git a/labs/lf/virtual_kvm/fuel/scripts/.gitkeep b/labs/lf/virtual_kvm/fuel/scripts/.gitkeep new file mode 100644 index 0000000..e69de29 -- cgit 1.2.3-korg