aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--deploy/adapters/ansible/kubernetes/roles/install-k8s-dependence/vars/Debian.yml1
-rw-r--r--deploy/adapters/ansible/kubernetes/roles/install-k8s-dependence/vars/RedHat.yml2
-rw-r--r--deploy/conf/hardware_environment/huawei-pod8/k8-nosdn-nofeature-ha.yml73
-rw-r--r--deploy/conf/hardware_environment/huawei-pod8/k8-nosdn-nofeature-noha.yml39
-rw-r--r--deploy/conf/hardware_environment/huawei-pod8/network.yml126
5 files changed, 240 insertions, 1 deletions
diff --git a/deploy/adapters/ansible/kubernetes/roles/install-k8s-dependence/vars/Debian.yml b/deploy/adapters/ansible/kubernetes/roles/install-k8s-dependence/vars/Debian.yml
index 8ced18b4..0453dc44 100644
--- a/deploy/adapters/ansible/kubernetes/roles/install-k8s-dependence/vars/Debian.yml
+++ b/deploy/adapters/ansible/kubernetes/roles/install-k8s-dependence/vars/Debian.yml
@@ -9,6 +9,7 @@ packages:
- python-iniparse
- python-lxml
- python-crypto
+ - git
pip_packages:
- crudini
diff --git a/deploy/adapters/ansible/kubernetes/roles/install-k8s-dependence/vars/RedHat.yml b/deploy/adapters/ansible/kubernetes/roles/install-k8s-dependence/vars/RedHat.yml
index b7e1d3dc..1adf1dfc 100644
--- a/deploy/adapters/ansible/kubernetes/roles/install-k8s-dependence/vars/RedHat.yml
+++ b/deploy/adapters/ansible/kubernetes/roles/install-k8s-dependence/vars/RedHat.yml
@@ -11,7 +11,7 @@ packages:
- lsof
- strace
- net-tools
-
+ - git
pip_packages:
- crudini
diff --git a/deploy/conf/hardware_environment/huawei-pod8/k8-nosdn-nofeature-ha.yml b/deploy/conf/hardware_environment/huawei-pod8/k8-nosdn-nofeature-ha.yml
new file mode 100644
index 00000000..60b7466b
--- /dev/null
+++ b/deploy/conf/hardware_environment/huawei-pod8/k8-nosdn-nofeature-ha.yml
@@ -0,0 +1,73 @@
+##############################################################################
+# Copyright (c) 2016 HUAWEI TECHNOLOGIES CO.,LTD and others.
+#
+# 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
+##############################################################################
+
+---
+
+TYPE: baremetal
+FLAVOR: cluster
+POWER_TOOL: ipmitool
+
+ipmiVer: '2.0'
+
+hosts:
+ - name: host1
+ mac: '14:30:04:F2:24:CB'
+ ipmiUser: root
+ ipmiPass: Opnfv@podarm
+ ipmiIp: 172.16.130.81
+ interfaces:
+ - eth1: '14:30:04:F2:24:CC'
+ roles:
+ - kube_master
+ - etcd
+ - ha
+
+ - name: host2
+ mac: '14:30:04:F2:24:3B'
+ ipmiIp: 172.16.130.82
+ ipmiUser: root
+ ipmiPass: Opnfv@podarm
+ interfaces:
+ - eth1: '14:30:04:F2:24:3C'
+ roles:
+ - kube_master
+ - etcd
+ - ha
+
+ - name: host3
+ mac: '14:30:04:F2:24:FB'
+ ipmiIp: 172.16.130.83
+ ipmiUser: root
+ ipmiPass: Opnfv@podarm
+ interfaces:
+ - eth1: '14:30:04:F2:24:FC'
+ roles:
+ - kube_master
+ - etcd
+ - ha
+
+ - name: host4
+ mac: '14:30:04:F2:25:EB'
+ ipmiIp: 172.16.130.84
+ ipmiUser: root
+ ipmiPass: Opnfv@podarm
+ interfaces:
+ - eth1: '14:30:04:F2:25:EC'
+ roles:
+ - kube_node
+
+ - name: host5
+ mac: '14:30:04:F2:25:8B'
+ ipmiIp: 172.16.130.85
+ ipmiUser: root
+ ipmiPass: Opnfv@podarm
+ interfaces:
+ - eth1: '14:30:04:F2:25:8C'
+ roles:
+ - kube_node
diff --git a/deploy/conf/hardware_environment/huawei-pod8/k8-nosdn-nofeature-noha.yml b/deploy/conf/hardware_environment/huawei-pod8/k8-nosdn-nofeature-noha.yml
new file mode 100644
index 00000000..7a1a92c1
--- /dev/null
+++ b/deploy/conf/hardware_environment/huawei-pod8/k8-nosdn-nofeature-noha.yml
@@ -0,0 +1,39 @@
+##############################################################################
+# Copyright (c) 2016 HUAWEI TECHNOLOGIES CO.,LTD and others.
+#
+# 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
+##############################################################################
+
+---
+
+TYPE: baremetal
+FLAVOR: cluster
+POWER_TOOL: ipmitool
+
+ipmiVer: '2.0'
+
+hosts:
+ - name: host1
+ mac: '14:30:04:F2:24:CB'
+ ipmiUser: root
+ ipmiPass: Opnfv@podarm
+ ipmiIp: 172.16.130.81
+ interfaces:
+ - eth1: '14:30:04:F2:24:CC'
+ roles:
+ - kube_master
+ - etcd
+ - ha
+
+ - name: host2
+ mac: '14:30:04:F2:24:3B'
+ ipmiIp: 172.16.130.82
+ ipmiUser: root
+ ipmiPass: Opnfv@podarm
+ interfaces:
+ - eth1: '14:30:04:F2:24:3C'
+ roles:
+ - kube_node
diff --git a/deploy/conf/hardware_environment/huawei-pod8/network.yml b/deploy/conf/hardware_environment/huawei-pod8/network.yml
new file mode 100644
index 00000000..6a75f34d
--- /dev/null
+++ b/deploy/conf/hardware_environment/huawei-pod8/network.yml
@@ -0,0 +1,126 @@
+##############################################################################
+# Copyright (c) 2016 HUAWEI TECHNOLOGIES CO.,LTD and others.
+#
+# 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
+##############################################################################
+
+---
+nic_mappings: []
+bond_mappings: []
+
+provider_net_mappings:
+ - name: br-provider
+ network: physnet
+ interface: eth10
+ type: ovs
+ role:
+ - controller
+
+sys_intf_mappings:
+ - name: mgmt
+ interface: eth0
+ type: normal
+ vlan_tag: None
+ role:
+ - controller
+ - compute
+
+ - name: tenant
+ interface: eth1
+ type: normal
+ vlan_tag: 1401
+ role:
+ - controller
+ - compute
+
+ - name: storage
+ interface: eth1
+ type: normal
+ vlan_tag: 1402
+ role:
+ - controller
+ - compute
+
+ - name: external
+ interface: eth1
+ type: normal
+ vlan_tag: None
+ role:
+ - controller
+ - compute
+
+ip_settings:
+ - name: mgmt
+ ip_ranges:
+ - - "10.1.0.50"
+ - "10.1.0.100"
+ dhcp_ranges:
+ - - "10.1.0.2"
+ - "10.1.0.49"
+ cidr: "10.1.0.0/24"
+ gw: "10.1.0.1"
+ role:
+ - controller
+ - compute
+
+ - name: tenant
+ ip_ranges:
+ - - "172.16.1.1"
+ - "172.16.1.50"
+ cidr: "172.16.1.0/24"
+ role:
+ - controller
+ - compute
+
+ - name: storage
+ ip_ranges:
+ - - "172.16.2.1"
+ - "172.16.2.50"
+ cidr: "172.16.2.0/24"
+ role:
+ - controller
+ - compute
+
+ - name: external
+ ip_ranges:
+ - - "172.30.14.10"
+ - "172.30.14.50"
+ cidr: "172.30.14.0/24"
+ gw: "172.30.14.1"
+ role:
+ - controller
+ - compute
+
+internal_vip:
+ ip: 10.1.0.222
+ netmask: "24"
+ interface: mgmt
+
+public_vip:
+ ip: 172.30.14.222
+ netmask: "24"
+ interface: external
+
+onos_nic: eth2
+tenant_net_info:
+ type: vxlan
+ range: "1:1000"
+ provider_network: None
+
+public_net_info:
+ enable: "True"
+ network: ext-net
+ type: flat
+ segment_id: 10
+ subnet: ext-subnet
+ provider_network: physnet
+ router: router-ext
+ enable_dhcp: "False"
+ no_gateway: "False"
+ external_gw: "172.30.14.1"
+ floating_ip_cidr: "172.30.14.0/24"
+ floating_ip_start: "172.30.14.100"
+ floating_ip_end: "172.30.14.200"