Code Review / compass4nfv.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | patch | inline | side by side (parent: 0803796)
compass: Align scenario short names 85/6785/1
authormeimei <meimei@huawei.com>
Thu, 14 Jan 2016 12:05:19 +0000 (20:05 +0800)
committerJustin chi <chigang@huawei.com>
Fri, 15 Jan 2016 03:41:49 +0000 (03:41 +0000)
Change-Id: Ic64acc0e5971b596d5ff77fc89d3867fe36f0281
Signed-off-by: meimei <meimei@huawei.com>
(cherry picked from commit 7c7e58d3fa6d7d2b5deb02d68a767c98a7b7553a)

deploy/conf/hardware_environment/huawei-us-deploy-bare-1/network.yml [new file with mode: 0644] patch | blob
deploy/conf/hardware_environment/huawei-us-deploy-bare-1/os-nosdn-nofeature-ha.yml [new file with mode: 0644] patch | blob
deploy/conf/hardware_environment/huawei-us-deploy-bare-1/os-odl_l2-nofeature-ha.yml [new file with mode: 0644] patch | blob
deploy/conf/hardware_environment/huawei-us-deploy-bare-1/os-onos-nofeature-ha.yml [new file with mode: 0644] patch | blob
deploy/conf/vm_environment/os-nosdn-nofeature-ha.yml [new file with mode: 0644] patch | blob
deploy/conf/vm_environment/os-odl_l2-nofeature-ha.yml [new file with mode: 0644] patch | blob
deploy/conf/vm_environment/os-onos-nofeature-ha.yml [new file with mode: 0644] patch | blob

diff --git a/deploy/conf/hardware_environment/huawei-us-deploy-bare-1/network.yml b/deploy/conf/hardware_environment/huawei-us-deploy-bare-1/network.yml
new file mode 100644 (file)
index 0000000..154f415
--- /dev/null
+++ b/deploy/conf/hardware_environment/huawei-us-deploy-bare-1/network.yml
@@ -0,0 +1,90 @@
+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: 101
+    type: vlan
+    role:
+      - controller
+      - compute
+
+  - name: storage
+    interface: eth1
+    vlan_tag: 102
+    type: vlan
+    role:
+      - controller
+      - compute
+
+  - name: external
+    interface: br-prv
+    type: ovs
+    role:
+      - controller
+      - compute
+
+ip_settings:
+  - name: mgmt
+    ip_ranges:
+    - - "172.16.1.1"
+      - "172.16.1.254"
+    cidr: "172.16.1.0/24"
+    role:
+      - controller
+      - compute
+
+  - name: storage
+    ip_ranges:
+    - - "172.16.2.1"
+      - "172.16.2.254"
+    cidr: "172.16.2.0/24"
+    role:
+      - controller
+      - compute
+
+  - name: external
+    ip_ranges:
+    - - "192.168.10.10"
+      - "192.168.10.50"
+    cidr: "192.168.10.0/24"
+    gw: "192.168.10.1"
+    role:
+      - controller
+      - compute
+
+internal_vip:
+  ip: 172.16.1.222
+  netmask: "24"
+  interface: mgmt
+
+public_vip:
+  ip: 192.168.10.51
+  netmask: "24"
+  interface: external
+
+onos_nic: eth2
+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: "192.168.10.1"
+  floating_ip_cidr: "192.168.10.0/24"
+  floating_ip_start: "192.168.10.100"
+  floating_ip_end: "192.168.10.200"
diff --git a/deploy/conf/hardware_environment/huawei-us-deploy-bare-1/os-nosdn-nofeature-ha.yml b/deploy/conf/hardware_environment/huawei-us-deploy-bare-1/os-nosdn-nofeature-ha.yml
new file mode 100644 (file)
index 0000000..47df7ff
--- /dev/null
+++ b/deploy/conf/hardware_environment/huawei-us-deploy-bare-1/os-nosdn-nofeature-ha.yml
@@ -0,0 +1,39 @@
+
+TYPE: baremetal
+FLAVOR: cluster
+POWER_TOOL: ipmitool
+
+ipmiUser: root
+ipmiVer: '2.0'
+
+hosts:
+  - name: host2
+    mac: 'E0:24:7F:02:15:A3'
+    ipmiIp: 172.16.130.28
+    ipmiPass: huawei@123
+    roles:
+      - controller
+      - ha
+
+  - name: host3
+    mac: 'D8:49:0B:DA:2A:28'
+    ipmiIp: 172.16.130.29
+    ipmiPass: Huawei@123
+    roles:
+      - controller
+      - ha
+
+  - name: host4
+    mac: 'D8:49:0B:DA:5B:5D'
+    ipmiIp: 172.16.130.30
+    ipmiPass: Huawei@123
+    roles:
+      - compute
+
+  - name: host5
+    mac: 'D8:49:0B:DA:56:85'
+    ipmiIp: 172.16.130.31
+    ipmiPass: Huawei@123
+    roles:
+      - compute
+
diff --git a/deploy/conf/hardware_environment/huawei-us-deploy-bare-1/os-odl_l2-nofeature-ha.yml b/deploy/conf/hardware_environment/huawei-us-deploy-bare-1/os-odl_l2-nofeature-ha.yml
new file mode 100644 (file)
index 0000000..f5f9ae3
--- /dev/null
+++ b/deploy/conf/hardware_environment/huawei-us-deploy-bare-1/os-odl_l2-nofeature-ha.yml
@@ -0,0 +1,41 @@
+
+TYPE: baremetal
+FLAVOR: cluster
+POWER_TOOL: ipmitool
+
+ipmiUser: root
+ipmiVer: '2.0'
+
+hosts:
+  - name: host2
+    mac: 'E0:24:7F:02:15:A3'
+    ipmiIp: 172.16.130.28
+    ipmiPass: huawei@123
+    roles:
+      - controller
+      - ha
+      - odl
+
+  - name: host3
+    mac: 'D8:49:0B:DA:2A:28'
+    ipmiIp: 172.16.130.29
+    ipmiPass: Huawei@123
+    roles:
+      - controller
+      - ha
+      - odl
+
+  - name: host4
+    mac: 'D8:49:0B:DA:5B:5D'
+    ipmiIp: 172.16.130.30
+    ipmiPass: Huawei@123
+    roles:
+      - compute
+
+  - name: host5
+    mac: 'D8:49:0B:DA:56:85'
+    ipmiIp: 172.16.130.31
+    ipmiPass: Huawei@123
+    roles:
+      - compute
+
diff --git a/deploy/conf/hardware_environment/huawei-us-deploy-bare-1/os-onos-nofeature-ha.yml b/deploy/conf/hardware_environment/huawei-us-deploy-bare-1/os-onos-nofeature-ha.yml
new file mode 100644 (file)
index 0000000..88f261d
--- /dev/null
+++ b/deploy/conf/hardware_environment/huawei-us-deploy-bare-1/os-onos-nofeature-ha.yml
@@ -0,0 +1,41 @@
+
+TYPE: baremetal
+FLAVOR: cluster
+POWER_TOOL: ipmitool
+
+ipmiUser: root
+ipmiVer: '2.0'
+
+hosts:
+  - name: host2
+    mac: 'E0:24:7F:02:15:A3'
+    ipmiIp: 172.16.130.28
+    ipmiPass: huawei@123
+    roles:
+      - controller
+      - ha
+      - onos
+
+  - name: host3
+    mac: 'D8:49:0B:DA:2A:28'
+    ipmiIp: 172.16.130.29
+    ipmiPass: Huawei@123
+    roles:
+      - controller
+      - ha
+      - onos
+
+  - name: host4
+    mac: 'D8:49:0B:DA:5B:5D'
+    ipmiIp: 172.16.130.30
+    ipmiPass: Huawei@123
+    roles:
+      - compute
+
+  - name: host5
+    mac: 'D8:49:0B:DA:56:85'
+    ipmiIp: 172.16.130.31
+    ipmiPass: Huawei@123
+    roles:
+      - compute
+
diff --git a/deploy/conf/vm_environment/os-nosdn-nofeature-ha.yml b/deploy/conf/vm_environment/os-nosdn-nofeature-ha.yml
new file mode 100644 (file)
index 0000000..aa2a1b3
--- /dev/null
+++ b/deploy/conf/vm_environment/os-nosdn-nofeature-ha.yml
@@ -0,0 +1,32 @@
+TYPE: virtual
+FLAVOR: cluster
+
+hosts:
+  - name: host1
+    roles:
+      - controller
+      - ha
+      - ceph-adm
+      - ceph-mon
+
+  - name: host2
+    roles:
+      - controller
+      - ha
+      - ceph-mon
+
+  - name: host3
+    roles:
+      - controller
+      - ha
+      - ceph-mon
+
+  - name: host4
+    roles:
+      - compute
+      - ceph-osd
+
+  - name: host5
+    roles:
+      - compute
+      - ceph-osd
diff --git a/deploy/conf/vm_environment/os-odl_l2-nofeature-ha.yml b/deploy/conf/vm_environment/os-odl_l2-nofeature-ha.yml
new file mode 100644 (file)
index 0000000..e2ee19c
--- /dev/null
+++ b/deploy/conf/vm_environment/os-odl_l2-nofeature-ha.yml
@@ -0,0 +1,29 @@
+TYPE: virtual
+FLAVOR: cluster
+
+hosts:
+  - name: host1
+    roles:
+      - controller
+      - ha
+      - odl
+
+  - name: host2
+    roles:
+      - controller
+      - ha
+      - odl
+
+  - name: host3
+    roles:
+      - controller
+      - ha
+      - odl
+
+  - name: host4
+    roles:
+      - compute
+
+  - name: host5
+    roles:
+      - compute
diff --git a/deploy/conf/vm_environment/os-onos-nofeature-ha.yml b/deploy/conf/vm_environment/os-onos-nofeature-ha.yml
new file mode 100644 (file)
index 0000000..fcd07ef
--- /dev/null
+++ b/deploy/conf/vm_environment/os-onos-nofeature-ha.yml
@@ -0,0 +1,29 @@
+TYPE: virtual
+FLAVOR: cluster
+
+hosts:
+  - name: host1
+    roles:
+      - controller
+      - ha
+      - onos
+
+  - name: host2
+    roles:
+      - controller
+      - ha
+      - onos
+
+  - name: host3
+    roles:
+      - controller
+      - ha
+      - onos
+
+  - name: host4
+    roles:
+      - compute
+
+  - name: host5
+    roles:
+      - compute