Merge "Add labs for daisy"

6 files changed, 258 insertions, 0 deletions

diff --git a/labs/zte/pod2/daisy/config/deploy.yml b/labs/zte/pod2/daisy/config/deploy.yml
new file mode 100644
index 0000000..82a2fe1
--- /dev/null
+++ b/labs/zte/pod2/daisy/config/deploy.yml
@@ -0,0 +1,43 @@
+hosts:
+- name: 'node1'
+  roles:
+    - 'CONTROLLER_LB'
+  ipmi:
+    ip: 192.168.1.106
+    user: zteroot
+    password: superuser
+- name: 'node2'
+  roles:
+    - 'CONTROLLER_LB'
+  ipmi:
+    ip: 192.168.1.107
+    user: zteroot
+    password: superuser
+- name: 'node3'
+  roles:
+    - 'CONTROLLER_LB'
+  ipmi:
+    ip: 192.168.1.108
+    user: zteroot
+    password: superuser
+- name: 'node4'
+  roles:
+    - 'COMPUTER'
+  ipmi:
+    ip: 192.168.1.109
+    user: zteroot
+    password: superuser
+- name: 'node5'
+  roles:
+    - 'COMPUTER'
+  ipmi:
+    ip: 192.168.1.110
+    user: zteroot
+    password: superuser
+disks:
+  daisy: 50
+  controller: 50
+  compute: 50
+daisy_passwd: 'r00tme'
+daisy_ip: '10.20.7.2'
+daisy_gateway: '10.20.7.1'
diff --git a/labs/zte/pod2/daisy/config/network.yml b/labs/zte/pod2/daisy/config/network.yml
new file mode 100644
index 0000000..dcdc274
--- /dev/null
+++ b/labs/zte/pod2/daisy/config/network.yml
@@ -0,0 +1,73 @@
+##############################################################################
+# Copyright (c) 2017 ZTE Coreporation and others.
+# hu.zhijiang@zte.com.cn
+# sun.jing22@zte.com.cn
+# 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
+##############################################################################
+
+##############################################################################
+# Description
+# MANAGEMENT: used for PXE, no vlan used
+# SOTRAGE: used for storage access
+# EXTERNAL: tenant public/floating IP associated network,
+#     requires a dedicated interface
+# PUBLICAPI: used for horizon access, openstack API access
+# TENANT: used for tenant access, vlan and VxLan supported, default VxLan
+##############################################################################
+network-config-metadata:
+  title: 'Deployment Adapter for baremetal POD'
+  version: '0.1'
+  created: 'Feb 2 2017'
+  comment: 'For Daisy initial'
+networks:
+  - cidr: '192.168.71.0/24'
+    gateway: '192.168.71.1'
+    ip_ranges:
+      - 'start': '192.168.71.1'
+        'end': '192.168.71.254'
+    vlan: null
+    name: 'MANAGEMENT'
+  - cidr: '192.168.72.0/24'
+    gateway: '192.168.72.1'
+    ip_ranges:
+      - 'start': '192.168.72.1'
+        'end': '192.168.72.254'
+    vlan: 172
+    name: 'STORAGE'
+  - cidr: '172.70.0.0/24'
+    gateway: '172.70.0.0'
+    ip_ranges:
+      - 'start': '172.70.0.1'
+        'end': '172.70.0.100'
+    vlan: 173
+    'name': 'EXTERNAL'
+  - cidr: '10.20.7.0/24'
+    gateway: '10.20.7.1'
+    ip_ranges:
+      - 'start': '10.20.7.20'
+        'end': '10.20.7.200'
+    vlan: 171
+    name: 'PUBLICAPI'
+  - cidr: '192.168.73.0/24'
+    gateway: '192.168.73.1'
+    ip_ranges:
+      - 'start': '192.168.73.1'
+        'end': '192.168.73.254'
+    vlan: 1130
+    name: 'TENANT'
+interfaces:
+  - name: 'EXTERNAL'
+    interface: 'ens44f1'
+  - name: 'MANAGEMENT'
+    interface: 'ens4f0'
+  - name: 'PUBLICAPI'
+    interface: 'ens12f0'
+  - name: 'STORAGE'
+    interface: 'ens12f1'
+  - name: 'TENANT'
+    interface: 'ens44f0'
+internal_vip: '192.168.71.4'
+public_vip: '10.20.7.11'
diff --git a/labs/zte/virtual1/daisy/config/deploy.yml b/labs/zte/virtual1/daisy/config/deploy.yml
new file mode 100644
index 0000000..b094947
--- /dev/null
+++ b/labs/zte/virtual1/daisy/config/deploy.yml
@@ -0,0 +1,12 @@
+hosts:
+- name: 'all_in_one'
+  roles:
+    - 'CONTROLLER_LB'
+    - 'COMPUTER'
+disks:
+  daisy: 50
+  controller: 50
+  compute: 50
+daisy_passwd: 'r00tme'
+daisy_ip: '10.20.11.2'
+daisy_gateway: '10.20.11.1'
diff --git a/labs/zte/virtual1/daisy/config/network.yml b/labs/zte/virtual1/daisy/config/network.yml
new file mode 100644
index 0000000..49ae58e
--- /dev/null
+++ b/labs/zte/virtual1/daisy/config/network.yml
@@ -0,0 +1,59 @@
+##############################################################################
+# Copyright (c) 2016 ZTE Coreporation and others.
+# hu.zhijiang@zte.com.cn
+# sun.jing22@zte.com.cn
+# 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
+##############################################################################
+
+network-config-metadata:
+  title: 'zte-virtual network config'
+  version: '0.1'
+  created: 'Mon Oct 31 2016'
+  comment:
+networks:
+  - cidr: '10.20.11.0/24'
+    gateway: '10.20.11.1'
+    ip_ranges:
+    - 'start': '10.20.11.3'
+      'end': '10.20.11.10'
+    name: 'MANAGEMENT'
+  - cidr: '10.20.11.0/24'
+    gateway: '10.20.11.1'
+    ip_ranges:
+    - start: '10.20.11.3'
+      end: '10.20.11.10'
+    name: 'STORAGE'
+  - cidr: '172.10.101.0/24'
+    gateway: '172.10.101.0'
+    ip_ranges:
+    - 'start': '172.10.101.1'
+      'end': '172.10.101.10'
+    'name': 'EXTERNAL'
+  - cidr: '10.20.11.0/24'
+    gateway: '10.20.11.1'
+    ip_ranges:
+    - 'start': '10.20.11.3'
+      'end': '10.20.11.10'
+    name: 'PUBLICAPI'
+  - cidr: '10.20.11.0/24'
+    gateway: '10.20.11.1'
+    ip_ranges:
+    - 'start': '10.20.11.3'
+      'end': '10.20.11.10'
+    name: 'TENANT'
+interfaces:
+  - name: 'EXTERNAL'
+    interface: 'ens8'
+  - name: 'MANAGEMENT'
+    interface: 'ens3'
+  - name: 'PUBLICAPI'
+    interface: 'ens3'
+  - name: 'STORAGE'
+    interface: 'ens3'
+  - name: 'TENANT'
+    interface: 'ens3'
+internal_vip: '10.20.11.11'
+public_vip: '10.20.11.11'
diff --git a/labs/zte/virtual2/daisy/config/deploy.yml b/labs/zte/virtual2/daisy/config/deploy.yml
new file mode 100644
index 0000000..b094947
--- /dev/null
+++ b/labs/zte/virtual2/daisy/config/deploy.yml
@@ -0,0 +1,12 @@
+hosts:
+- name: 'all_in_one'
+  roles:
+    - 'CONTROLLER_LB'
+    - 'COMPUTER'
+disks:
+  daisy: 50
+  controller: 50
+  compute: 50
+daisy_passwd: 'r00tme'
+daisy_ip: '10.20.11.2'
+daisy_gateway: '10.20.11.1'
diff --git a/labs/zte/virtual2/daisy/config/network.yml b/labs/zte/virtual2/daisy/config/network.yml
new file mode 100644
index 0000000..49ae58e
--- /dev/null
+++ b/labs/zte/virtual2/daisy/config/network.yml
@@ -0,0 +1,59 @@
+##############################################################################
+# Copyright (c) 2016 ZTE Coreporation and others.
+# hu.zhijiang@zte.com.cn
+# sun.jing22@zte.com.cn
+# 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
+##############################################################################
+
+network-config-metadata:
+  title: 'zte-virtual network config'
+  version: '0.1'
+  created: 'Mon Oct 31 2016'
+  comment:
+networks:
+  - cidr: '10.20.11.0/24'
+    gateway: '10.20.11.1'
+    ip_ranges:
+    - 'start': '10.20.11.3'
+      'end': '10.20.11.10'
+    name: 'MANAGEMENT'
+  - cidr: '10.20.11.0/24'
+    gateway: '10.20.11.1'
+    ip_ranges:
+    - start: '10.20.11.3'
+      end: '10.20.11.10'
+    name: 'STORAGE'
+  - cidr: '172.10.101.0/24'
+    gateway: '172.10.101.0'
+    ip_ranges:
+    - 'start': '172.10.101.1'
+      'end': '172.10.101.10'
+    'name': 'EXTERNAL'
+  - cidr: '10.20.11.0/24'
+    gateway: '10.20.11.1'
+    ip_ranges:
+    - 'start': '10.20.11.3'
+      'end': '10.20.11.10'
+    name: 'PUBLICAPI'
+  - cidr: '10.20.11.0/24'
+    gateway: '10.20.11.1'
+    ip_ranges:
+    - 'start': '10.20.11.3'
+      'end': '10.20.11.10'
+    name: 'TENANT'
+interfaces:
+  - name: 'EXTERNAL'
+    interface: 'ens8'
+  - name: 'MANAGEMENT'
+    interface: 'ens3'
+  - name: 'PUBLICAPI'
+    interface: 'ens3'
+  - name: 'STORAGE'
+    interface: 'ens3'
+  - name: 'TENANT'
+    interface: 'ens3'
+internal_vip: '10.20.11.11'
+public_vip: '10.20.11.11'