From 2ae42e67d316e7fdf2b25303907e20c336de8d5f Mon Sep 17 00:00:00 2001 From: Francois DESPRES Date: Wed, 25 Jan 2017 10:59:31 +0100 Subject: New patch for orange-pod3 POD with indentation correction for network*.yml files Change-Id: Ifa100d6e444c4190d8f15d980c4fd72f8b953a1d Signed-off-by: Francois DESPRES --- .../hardware_environment/orange-pod3/network.yml | 91 ++++++++++++++++++++++ .../orange-pod3/network_ocl.yml | 91 ++++++++++++++++++++++ .../orange-pod3/network_onos.yml | 91 ++++++++++++++++++++++ .../orange-pod3/os-nosdn-nofeature-ha.yml | 63 +++++++++++++++ .../orange-pod3/os-ocl-nofeature-ha.yml | 61 +++++++++++++++ .../orange-pod3/os-odl_l2-moon-ha.yml | 67 ++++++++++++++++ .../orange-pod3/os-odl_l2-nofeature-ha.yml | 65 ++++++++++++++++ .../orange-pod3/os-odl_l3-nofeature-ha.yml | 67 ++++++++++++++++ .../orange-pod3/os-onos-nofeature-ha.yml | 65 ++++++++++++++++ .../orange-pod3/os-onos-sfc-ha.yml | 67 ++++++++++++++++ 10 files changed, 728 insertions(+) create mode 100755 deploy/conf/hardware_environment/orange-pod3/network.yml create mode 100755 deploy/conf/hardware_environment/orange-pod3/network_ocl.yml create mode 100755 deploy/conf/hardware_environment/orange-pod3/network_onos.yml create mode 100755 deploy/conf/hardware_environment/orange-pod3/os-nosdn-nofeature-ha.yml create mode 100755 deploy/conf/hardware_environment/orange-pod3/os-ocl-nofeature-ha.yml create mode 100755 deploy/conf/hardware_environment/orange-pod3/os-odl_l2-moon-ha.yml create mode 100755 deploy/conf/hardware_environment/orange-pod3/os-odl_l2-nofeature-ha.yml create mode 100755 deploy/conf/hardware_environment/orange-pod3/os-odl_l3-nofeature-ha.yml create mode 100755 deploy/conf/hardware_environment/orange-pod3/os-onos-nofeature-ha.yml create mode 100755 deploy/conf/hardware_environment/orange-pod3/os-onos-sfc-ha.yml (limited to 'deploy/conf') diff --git a/deploy/conf/hardware_environment/orange-pod3/network.yml b/deploy/conf/hardware_environment/orange-pod3/network.yml new file mode 100755 index 00000000..a1e1c590 --- /dev/null +++ b/deploy/conf/hardware_environment/orange-pod3/network.yml @@ -0,0 +1,91 @@ +--- +nic_mappings: [] +bond_mappings: [] + +provider_net_mappings: + - name: br-prv + network: physnet + interface: eth1 + type: ovs + role: + - controller + - compute + +sys_intf_mappings: + - name: mgmt + interface: eth1 + vlan_tag: 19 + type: vlan + role: + - controller + - compute + + - name: storage + interface: eth1 + vlan_tag: 12 + type: vlan + role: + - controller + - compute + + - name: external + interface: br-prv + type: ovs + role: + - controller + - compute + +ip_settings: + - name: mgmt + ip_ranges: + - - "172.31.19.2" + - "172.31.19.253" + cidr: "172.31.19.0/24" + role: + - controller + - compute + + - name: storage + ip_ranges: + - - "172.31.12.2" + - "172.31.12.253" + cidr: "172.31.12.0/24" + role: + - controller + - compute + + - name: external + ip_ranges: + - - "172.31.20.10" + - "172.31.20.50" + cidr: "172.31.20.0/24" + gw: "172.31.20.1" + role: + - controller + - compute + +internal_vip: + ip: 172.31.19.222 + netmask: "24" + interface: mgmt + +public_vip: + ip: 172.31.20.51 + netmask: "24" + interface: external + +onos_nic: eth1 +public_net_info: + enable: "True" + network: ext-net + type: flat + segment_id: 20 + subnet: ext-subnet + provider_network: physnet + router: router-ext + enable_dhcp: "False" + no_gateway: "False" + external_gw: "172.31.20.1" + floating_ip_cidr: "172.31.20.0/24" + floating_ip_start: "172.31.20.100" + floating_ip_end: "172.31.20.200" diff --git a/deploy/conf/hardware_environment/orange-pod3/network_ocl.yml b/deploy/conf/hardware_environment/orange-pod3/network_ocl.yml new file mode 100755 index 00000000..a1e1c590 --- /dev/null +++ b/deploy/conf/hardware_environment/orange-pod3/network_ocl.yml @@ -0,0 +1,91 @@ +--- +nic_mappings: [] +bond_mappings: [] + +provider_net_mappings: + - name: br-prv + network: physnet + interface: eth1 + type: ovs + role: + - controller + - compute + +sys_intf_mappings: + - name: mgmt + interface: eth1 + vlan_tag: 19 + type: vlan + role: + - controller + - compute + + - name: storage + interface: eth1 + vlan_tag: 12 + type: vlan + role: + - controller + - compute + + - name: external + interface: br-prv + type: ovs + role: + - controller + - compute + +ip_settings: + - name: mgmt + ip_ranges: + - - "172.31.19.2" + - "172.31.19.253" + cidr: "172.31.19.0/24" + role: + - controller + - compute + + - name: storage + ip_ranges: + - - "172.31.12.2" + - "172.31.12.253" + cidr: "172.31.12.0/24" + role: + - controller + - compute + + - name: external + ip_ranges: + - - "172.31.20.10" + - "172.31.20.50" + cidr: "172.31.20.0/24" + gw: "172.31.20.1" + role: + - controller + - compute + +internal_vip: + ip: 172.31.19.222 + netmask: "24" + interface: mgmt + +public_vip: + ip: 172.31.20.51 + netmask: "24" + interface: external + +onos_nic: eth1 +public_net_info: + enable: "True" + network: ext-net + type: flat + segment_id: 20 + subnet: ext-subnet + provider_network: physnet + router: router-ext + enable_dhcp: "False" + no_gateway: "False" + external_gw: "172.31.20.1" + floating_ip_cidr: "172.31.20.0/24" + floating_ip_start: "172.31.20.100" + floating_ip_end: "172.31.20.200" diff --git a/deploy/conf/hardware_environment/orange-pod3/network_onos.yml b/deploy/conf/hardware_environment/orange-pod3/network_onos.yml new file mode 100755 index 00000000..03a4586a --- /dev/null +++ b/deploy/conf/hardware_environment/orange-pod3/network_onos.yml @@ -0,0 +1,91 @@ +--- +nic_mappings: [] +bond_mappings: [] + +provider_net_mappings: + - name: br-prv + network: physnet + interface: eth1 + type: ovs + role: + - controller + - compute + +sys_intf_mappings: + - name: mgmt + interface: eth1 + vlan_tag: 19 + type: vlan + role: + - controller + - compute + + - name: storage + interface: eth1 + vlan_tag: 12 + type: vlan + role: + - controller + - compute + + - name: external + interface: br-prv + type: ovs + role: + - controller + - compute + +ip_settings: + - name: mgmt + ip_ranges: + - - "172.31.19.2" + - "172.31.19.253" + cidr: "172.31.19.0/24" + role: + - controller + - compute + + - name: storage + ip_ranges: + - - "172.31.12.2" + - "172.31.12.253" + cidr: "172.31.12.0/24" + role: + - controller + - compute + + - name: external + ip_ranges: + - - "172.31.20.10" + - "172.31.20.50" + cidr: "172.31.20.0/24" + gw: "172.31.20.1" + role: + - controller + - compute + +internal_vip: + ip: 172.31.19.222 + netmask: "24" + interface: mgmt + +public_vip: + ip: 172.31.20.51 + netmask: "24" + interface: external + +onos_nic: eth2 +public_net_info: + enable: "True" + network: ext-net + type: vxlan + segment_id: 20 + subnet: ext-subnet + provider_network: physnet + router: router-ext + enable_dhcp: "False" + no_gateway: "False" + external_gw: "172.31.20.1" + floating_ip_cidr: "172.31.20.0/24" + floating_ip_start: "172.31.20.100" + floating_ip_end: "172.31.20.200" diff --git a/deploy/conf/hardware_environment/orange-pod3/os-nosdn-nofeature-ha.yml b/deploy/conf/hardware_environment/orange-pod3/os-nosdn-nofeature-ha.yml new file mode 100755 index 00000000..e3bc1810 --- /dev/null +++ b/deploy/conf/hardware_environment/orange-pod3/os-nosdn-nofeature-ha.yml @@ -0,0 +1,63 @@ +--- +TYPE: baremetal +FLAVOR: cluster +POWER_TOOL: ipmitool + +ipmiUser: orange +ipmiVer: '2.0' + +hosts: + - name: charlotteR630 + mac: '14:18:77:34:89:E2' + interfaces: + - eth1: 'A0:36:9F:4E:87:1A' + ipmiIp: 172.31.2.116 + ipmiPass: orange2014* + roles: + - controller + - ha + - ceph-adm + - ceph-mon + + - name: cookieR630 + mac: '14:18:77:34:A2:AC' + interfaces: + - eth1: 'A0:36:9F:4E:8B:AE' + ipmiIp: 172.31.2.117 + ipmiPass: orange2014* + roles: + - controller + - ha + - ceph-osd + - ceph-mon + + - name: cheesecakeR630 + mac: '14:18:77:34:8E:40' + interfaces: + - eth1: 'A0:36:9F:4E:8E:DA' + ipmiIp: 172.31.2.119 + ipmiPass: orange2014* + roles: + - controller + - ha + - ceph-osd + + - name: eclairR730 + mac: 'EC:F4:BB:CB:62:AC' + interfaces: + - eth1: 'EC:F4:BB:CB:62:AA' + ipmiIp: 172.31.2.123 + ipmiPass: orange2014* + roles: + - compute + - ceph-osd + + - name: chouR730 + mac: 'EC:F4:BB:CB:5F:64' + interfaces: + - eth1: 'EC:F4:BB:CB:5F:62' + ipmiIp: 172.31.2.120 + ipmiPass: orange2014* + roles: + - compute + - ceph-osd diff --git a/deploy/conf/hardware_environment/orange-pod3/os-ocl-nofeature-ha.yml b/deploy/conf/hardware_environment/orange-pod3/os-ocl-nofeature-ha.yml new file mode 100755 index 00000000..b979be7e --- /dev/null +++ b/deploy/conf/hardware_environment/orange-pod3/os-ocl-nofeature-ha.yml @@ -0,0 +1,61 @@ +--- +TYPE: baremetal +FLAVOR: cluster +POWER_TOOL: ipmitool + +ipmiUser: orange +ipmiVer: '2.0' + +hosts: + - name: charlotteR630 + mac: '14:18:77:34:89:E2' # PXE slot 0/3 vlan14 + interfaces: + - eth1: 'A0:36:9F:4E:87:1A' # slot 1/2 TRUNK + ipmiIp: 172.31.2.116 + ipmiPass: orange2014* + roles: + - controller + - ha + - opencontrail + - ceph-adm + - ceph-mon + + - name: cookieR630 + mac: '14:18:77:34:A2:AC' # PXE slot 0/3 vlan14 + interfaces: + - eth1: 'A0:36:9F:4E:8B:AE' # slot 1/2 trunk + ipmiIp: 172.31.2.117 + ipmiPass: orange2014* + roles: + - compute + - ceph-osd + + - name: cheesecakeR630 + mac: '14:18:77:34:8E:40' # PXE slot 0/3 vlan14 + interfaces: + - eth1: 'A0:36:9F:4E:8E:DA' # slot 1/2 trunk + ipmiIp: 172.31.2.119 + ipmiPass: orange2014* + roles: + - compute + - ceph-osd + + - name: eclairR730 + mac: 'EC:F4:BB:CB:62:AC' # PXE slot 0/3 vlan14 + interfaces: + - eth1: 'EC:F4:BB:CB:62:AA' # slot 0/2 trunk + ipmiIp: 172.31.2.123 + ipmiPass: orange2014* + roles: + - compute + - ceph-osd + + - name: chouR730 + mac: 'EC:F4:BB:CB:5F:64' # PXE slot 0/3 vlan14 + interfaces: + - eth1: 'EC:F4:BB:CB:5F:62' # slot 0/2 trunk + ipmiIp: 172.31.2.120 + ipmiPass: orange2014* + roles: + - compute + - ceph-osd diff --git a/deploy/conf/hardware_environment/orange-pod3/os-odl_l2-moon-ha.yml b/deploy/conf/hardware_environment/orange-pod3/os-odl_l2-moon-ha.yml new file mode 100755 index 00000000..6d7a066e --- /dev/null +++ b/deploy/conf/hardware_environment/orange-pod3/os-odl_l2-moon-ha.yml @@ -0,0 +1,67 @@ +--- +TYPE: baremetal +FLAVOR: cluster +POWER_TOOL: ipmitool + +ipmiUser: orange +ipmiVer: '2.0' + +moon: "Enable" + +hosts: + - name: charlotteR630 + mac: '14:18:77:34:89:E2' # PXE slot 0/3 vlan14 + interfaces: + - eth1: 'A0:36:9F:4E:87:1A ' # slot 1/2 TRUNK + ipmiIp: 172.31.2.116 + ipmiPass: orange2014* + roles: + - controller + - ha + - odl + - ceph-adm + - ceph-mon + + - name: cookieR630 + mac: '14:18:77:34:A2:AC' # PXE slot 0/3 vlan14 + interfaces: + - eth1: 'A0:36:9F:4E:8B:AE' # slot 1/2 trunk + ipmiIp: 172.31.2.117 + ipmiPass: orange2014* + roles: + - controller + - ha + - odl + - ceph-mon + + - name: cheesecakeR630 + mac: '14:18:77:34:8E:40' # PXE slot 0/3 vlan14 + interfaces: + - eth1: 'A0:36:9F:4E:8E:DA' # slot 1/2 trunk + ipmiIp: 172.31.2.119 + ipmiPass: orange2014* + roles: + - controller + - ha + - odl + - ceph-mon + + - name: eclairR730 + mac: 'EC:F4:BB:CB:62:AC' # PXE slot 0/3 vlan14 + interfaces: + - eth1: 'EC:F4:BB:CB:62:AA' # slot 0/2 trunk + ipmiIp: 172.31.2.123 + ipmiPass: orange2014* + roles: + - compute + - ceph-osd + + - name: chouR730 + mac: 'EC:F4:BB:CB:5F:64' # PXE slot 0/3 vlan14 + interfaces: + - eth1: 'EC:F4:BB:CB:5F:62' # slot 0/2 trunk + ipmiIp: 172.31.2.120 + ipmiPass: orange2014* + roles: + - compute + - ceph-osd diff --git a/deploy/conf/hardware_environment/orange-pod3/os-odl_l2-nofeature-ha.yml b/deploy/conf/hardware_environment/orange-pod3/os-odl_l2-nofeature-ha.yml new file mode 100755 index 00000000..053851de --- /dev/null +++ b/deploy/conf/hardware_environment/orange-pod3/os-odl_l2-nofeature-ha.yml @@ -0,0 +1,65 @@ +--- +TYPE: baremetal +FLAVOR: cluster +POWER_TOOL: ipmitool + +ipmiUser: orange +ipmiVer: '2.0' + +hosts: + - name: charlotteR630 + mac: '14:18:77:34:89:E2' # PXE slot 0/3 vlan14 + interfaces: + - eth1: 'A0:36:9F:4E:87:1A' # slot 1/2 TRUNK + ipmiIp: 172.31.2.116 + ipmiPass: orange2014* + roles: + - controller + - ha + - odl + - ceph-adm + - ceph-mon + + - name: cookieR630 + mac: '14:18:77:34:A2:AC' # PXE slot 0/3 vlan14 + interfaces: + - eth1: 'A0:36:9F:4E:8B:AE' # slot 1/2 trunk + ipmiIp: 172.31.2.117 + ipmiPass: orange2014* + roles: + - controller + - ha + - odl + - ceph-mon + + - name: cheesecakeR630 + mac: '14:18:77:34:8E:40' # PXE slot 0/3 vlan14 + interfaces: + - eth1: 'A0:36:9F:4E:8E:DA' # slot 1/2 trunk + ipmiIp: 172.31.2.119 + ipmiPass: orange2014* + roles: + - controller + - ha + - odl + - ceph-mon + + - name: eclairR730 + mac: 'EC:F4:BB:CB:62:AC ' # PXE slot 0/3 vlan14 + interfaces: + - eth1: 'EC:F4:BB:CB:62:AA' # slot 0/2 trunk + ipmiIp: 172.31.2.123 + ipmiPass: orange2014* + roles: + - compute + - ceph-osd + + - name: chouR730 + mac: 'EC:F4:BB:CB:5F:64' # PXE slot 0/3 vlan14 + interfaces: + - eth1: 'EC:F4:BB:CB:5F:62' # slot 0/2 trunk + ipmiIp: 172.31.2.120 + ipmiPass: orange2014* + roles: + - compute + - ceph-osd diff --git a/deploy/conf/hardware_environment/orange-pod3/os-odl_l3-nofeature-ha.yml b/deploy/conf/hardware_environment/orange-pod3/os-odl_l3-nofeature-ha.yml new file mode 100755 index 00000000..f18fec69 --- /dev/null +++ b/deploy/conf/hardware_environment/orange-pod3/os-odl_l3-nofeature-ha.yml @@ -0,0 +1,67 @@ +--- +TYPE: baremetal +FLAVOR: cluster +POWER_TOOL: ipmitool + +ipmiUser: orange +ipmiVer: '2.0' + +odl_l3_agent: "Enable" + +hosts: + - name: charlotteR630 + mac: '14:18:77:34:89:E2' # PXE slot 0/3 vlan14 + interfaces: + - eth1: 'A0:36:9F:4E:87:1A' # slot 1/2 TRUNK + ipmiIp: 172.31.2.116 + ipmiPass: orange2014* + roles: + - controller + - ha + - odl + - ceph-adm + - ceph-mon + + - name: cookieR630 + mac: '14:18:77:34:A2:AC' # PXE slot 0/3 vlan14 + interfaces: + - eth1: 'A0:36:9F:4E:8B:AE' # slot 1/2 trunk + ipmiIp: 172.31.2.117 + ipmiPass: orange2014* + roles: + - controller + - ha + - odl + - ceph-mon + + - name: cheesecakeR630 + mac: '14:18:77:34:8E:40' # PXE slot 0/3 vlan14 + interfaces: + - eth1: 'A0:36:9F:4E:8E:DA' # slot 1/2 trunk + ipmiIp: 172.31.2.119 + ipmiPass: orange2014* + roles: + - controller + - ha + - odl + - ceph-mon + + - name: eclairR730 + mac: 'EC:F4:BB:CB:62:AC' # PXE slot 0/3 vlan14 + interfaces: + - eth1: 'EC:F4:BB:CB:62:AA' # slot 0/2 trunk + ipmiIp: 172.31.2.123 + ipmiPass: orange2014* + roles: + - compute + - ceph-osd + + - name: chouR730 + mac: 'EC:F4:BB:CB:5F:64' # PXE slot 0/3 vlan14 + interfaces: + - eth1: 'EC:F4:BB:CB:5F:62' # slot 0/2 trunk + ipmiIp: 172.31.2.120 + ipmiPass: orange2014* + roles: + - compute + - ceph-osd diff --git a/deploy/conf/hardware_environment/orange-pod3/os-onos-nofeature-ha.yml b/deploy/conf/hardware_environment/orange-pod3/os-onos-nofeature-ha.yml new file mode 100755 index 00000000..554adf8f --- /dev/null +++ b/deploy/conf/hardware_environment/orange-pod3/os-onos-nofeature-ha.yml @@ -0,0 +1,65 @@ +--- +TYPE: baremetal +FLAVOR: cluster +POWER_TOOL: ipmitool + +ipmiUser: orange +ipmiVer: '2.0' + +hosts: + - name: charlotteR630 + mac: '14:18:77:34:89:E2' + interfaces: + - eth1: 'A0:36:9F:4E:87:1A' + ipmiIp: 172.31.2.116 + ipmiPass: orange2014* + roles: + - controller + - ha + - onos + - ceph-adm + - ceph-mon + + - name: cookieR630 + mac: '14:18:77:34:A2:AC' + interfaces: + - eth1: 'A0:36:9F:4E:8B:AE' + ipmiIp: 172.31.2.117 + ipmiPass: orange2014* + roles: + - controller + - ha + - onos + - ceph-mon + + - name: cheesecakeR630 + mac: '14:18:77:34:8E:40' + interfaces: + - eth1: 'A0:36:9F:4E:8E:DA' + ipmiIp: 172.31.2.119 + ipmiPass: orange2014* + roles: + - controller + - ha + - onos + - ceph-mon + + - name: eclairR730 + mac: 'EC:F4:BB:CB:62:AC' + interfaces: + - eth1: 'EC:F4:BB:CB:62:AA' + ipmiIp: 172.31.2.123 + ipmiPass: orange2014* + roles: + - compute + - ceph-osd + + - name: chouR730 + mac: 'EC:F4:BB:CB:5F:64' + interfaces: + - eth1: 'EC:F4:BB:CB:5F:62' + ipmiIp: 172.31.2.120 + ipmiPass: orange2014* + roles: + - compute + - ceph-osd diff --git a/deploy/conf/hardware_environment/orange-pod3/os-onos-sfc-ha.yml b/deploy/conf/hardware_environment/orange-pod3/os-onos-sfc-ha.yml new file mode 100755 index 00000000..fce2778c --- /dev/null +++ b/deploy/conf/hardware_environment/orange-pod3/os-onos-sfc-ha.yml @@ -0,0 +1,67 @@ +--- +TYPE: baremetal +FLAVOR: cluster +POWER_TOOL: ipmitool + +ipmiUser: orange +ipmiVer: '2.0' + +onos_sfc: "Enable" + +hosts: + - name: charlotteR630 + mac: '14:18:77:34:89:E2' # PXE slot 0/3 vlan14 + interfaces: + - eth1: 'A0:36:9F:4E:87:1A' # slot 1/2 TRUNK + ipmiIp: 172.31.2.116 + ipmiPass: orange2014* + roles: + - controller + - ha + - onos + - ceph-adm + - ceph-mon + + - name: cookieR630 + mac: '14:18:77:34:A2:AC' # PXE slot 0/3 vlan14 + interfaces: + - eth1: 'A0:36:9F:4E:8B:AE' # slot 1/2 trunk + ipmiIp: 172.31.2.117 + ipmiPass: orange2014* + roles: + - controller + - ha + - onos + - ceph-mon + + - name: cheesecakeR630 + mac: '14:18:77:34:8E:40' # PXE slot 0/3 vlan14 + interfaces: + - eth1: 'A0:36:9F:4E:8E:DA' # slot 1/2 trunk + ipmiIp: 172.31.2.119 + ipmiPass: orange2014* + roles: + - controller + - ha + - onos + - ceph-mon + + - name: eclairR730 + mac: 'EC:F4:BB:CB:62:AC' # PXE slot 0/3 vlan14 + interfaces: + - eth1: 'EC:F4:BB:CB:62:AA' # slot 0/2 trunk + ipmiIp: 172.31.2.123 + ipmiPass: orange2014* + roles: + - compute + - ceph-osd + + - name: chouR730 + mac: 'EC:F4:BB:CB:5F:64' # PXE slot 0/3 vlan14 + interfaces: + - eth1: 'EC:F4:BB:CB:5F:62' # slot 0/2 trunk + ipmiIp: 172.31.2.120 + ipmiPass: orange2014* + roles: + - compute + - ceph-osd -- cgit 1.2.3-korg