Support daisy on zte-pod3

Change-Id: I4bdf8a4a083d5731849aef40473eec2198d3a9b2
Signed-off-by: Alex Yang <yangyang1@zte.com.cn>

diff --git a/labs/zte/pod2/daisy/config/deploy.yml b/labs/zte/pod2/daisy/config/deploy.yml
index 8014919..249f43f 100644 (file)
--- a/labs/zte/pod2/daisy/config/deploy.yml
+++ b/labs/zte/pod2/daisy/config/deploy.yml
@@ -1,20 +1,75 @@
+##############################################################################
+# Copyright (c) 2017 ZTE Corporation 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
+##############################################################################
+
 adapter: ipmi
 hosts:
 - name: 'controller01'
   roles:
     - 'CONTROLLER_LB'
+  ipmi_ip: 192.168.1.106
+  ipmi_user: zteroot
+  ipmi_pass: superuser
+  mac_addresses:
+    - 74:4a:a4:00:cd:72
+    - 74:4a:a4:00:b0:e9
+    - 74:4a:a4:00:b0:ea
+    - 74:4a:a4:00:b0:eb
+    - 74:4a:a4:00:b0:ec
 - name: 'controller02'
   roles:
     - 'CONTROLLER_LB'
+  ipmi_ip: 192.168.1.107
+  ipmi_user: zteroot
+  ipmi_pass: superuser
+  mac_addresses:
+    - 74:4a:a4:00:ca:cc
+    - 74:4a:a4:00:d6:a3
+    - 74:4a:a4:00:d6:a4
+    - 74:4a:a4:00:d6:99
+    - 74:4a:a4:00:d6:9a
 - name: 'controller03'
   roles:
     - 'CONTROLLER_LB'
+  ipmi_ip: 192.168.1.108
+  ipmi_user: zteroot
+  ipmi_pass: superuser
+  mac_addresses:
+    - 74:4a:a4:00:cd:12
+    - 74:4a:a4:00:d6:9d
+    - 74:4a:a4:00:d6:9e
+    - 74:4a:a4:00:d3:15
+    - 74:4a:a4:00:d3:16
 - name: 'computer01'
   roles:
     - 'COMPUTER'
+  ipmi_ip: 192.168.1.109
+  ipmi_user: zteroot
+  ipmi_pass: superuser
+  mac_addresses:
+    - 74:4a:a4:00:cf:40
+    - 74:4a:a4:00:d6:a5
+    - 74:4a:a4:00:d6:a6
+    - 74:4a:a4:00:d6:a7
+    - 74:4a:a4:00:d6:a8
 - name: 'computer02'
   roles:
     - 'COMPUTER'
+  ipmi_ip: 192.168.1.110
+  ipmi_user: zteroot
+  ipmi_pass: superuser
+  mac_addresses:
+    - 74:4a:a4:00:ce:d4
+    - 74:4a:a4:00:d2:c3
+    - 74:4a:a4:00:d2:c4
+    - 74:4a:a4:00:d2:c1
+    - 74:4a:a4:00:d2:c2
 disks:
   daisy: 50
 daisy_passwd: 'r00tme'

diff --git a/labs/zte/pod2/daisy/config/network.yml b/labs/zte/pod2/daisy/config/network.yml
index 36640c1..49f5faf 100644 (file)
--- a/labs/zte/pod2/daisy/config/network.yml
+++ b/labs/zte/pod2/daisy/config/network.yml
@@ -1,5 +1,5 @@
 ##############################################################################
-# Copyright (c) 2017 ZTE Coreporation and others.
+# Copyright (c) 2017 ZTE Corporation and others.
 # hu.zhijiang@zte.com.cn
 # sun.jing22@zte.com.cn
 # All rights reserved. This program and the accompanying materials

diff --git a/labs/zte/pod3/daisy/config/deploy.yml b/labs/zte/pod3/daisy/config/deploy.yml
new file mode 100644 (file)
index 0000000..40ce85c
--- /dev/null
+++ b/labs/zte/pod3/daisy/config/deploy.yml
@@ -0,0 +1,73 @@
+##############################################################################
+# Copyright (c) 2017 ZTE Corporation 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
+##############################################################################
+
+adapter: ipmi
+hosts:
+- name: 'controller01'
+  roles:
+    - 'CONTROLLER_LB'
+  ipmi_ip: 192.168.1.32
+  ipmi_user: zteroot
+  ipmi_pass: superuser
+  mac_addresses:
+    - 74:4a:a4:00:0b:85
+    - 74:4a:a4:00:0b:86
+    - 74:4a:a4:00:0b:87
+    - 74:4a:a4:00:0b:88
+- name: 'controller02'
+  roles:
+    - 'CONTROLLER_LB'
+  ipmi_ip: 192.168.1.33
+  ipmi_user: zteroot
+  ipmi_pass: superuser
+  mac_addresses:
+    - 74:4a:a4:00:5c:5d
+    - 74:4a:a4:00:5c:5e
+    - 74:4a:a4:00:5c:5f
+    - 74:4a:a4:00:5c:60
+- name: 'controller03'
+  roles:
+    - 'CONTROLLER_LB'
+  ipmi_ip: 192.168.1.34
+  ipmi_user: zteroot
+  ipmi_pass: superuser
+  mac_addresses:
+    - 74:4a:a4:00:5c:35
+    - 74:4a:a4:00:5c:36
+    - 74:4a:a4:00:5c:37
+    - 74:4a:a4:00:5c:38
+- name: 'computer01'
+  roles:
+    - 'COMPUTER'
+  ipmi_ip: 192.168.1.35
+  ipmi_user: zteroot
+  ipmi_pass: superuser
+  mac_addresses:
+    - 74:4a:a4:00:5c:69
+    - 74:4a:a4:00:5c:6a
+    - 74:4a:a4:00:5c:6b
+    - 74:4a:a4:00:5c:6c
+- name: 'computer02'
+  roles:
+    - 'COMPUTER'
+  ipmi_ip: 192.168.1.36
+  ipmi_user: zteroot
+  ipmi_pass: superuser
+  mac_addresses:
+    - 74:4a:a4:00:5c:6d
+    - 74:4a:a4:00:5c:6e
+    - 74:4a:a4:00:5c:6f
+    - 74:4a:a4:00:5c:70
+disks:
+  daisy: 50
+daisy_passwd: 'r00tme'
+daisy_ip: '10.20.0.2'
+daisy_gateway: '10.20.0.1'
+ceph_disk_name: '/dev/sdb'

diff --git a/labs/zte/pod3/daisy/config/network.yml b/labs/zte/pod3/daisy/config/network.yml
new file mode 100644 (file)
index 0000000..ce297f7
--- /dev/null
+++ b/labs/zte/pod3/daisy/config/network.yml
@@ -0,0 +1,84 @@
+##############################################################################
+# Copyright (c) 2017 ZTE Corporation 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, 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: 'Sep 13 2017'
+  comment: 'For Daisy initial'
+networks:
+  - cidr: '192.168.11.0/24'
+    gateway: '192.168.11.1'
+    ip_ranges:
+      - 'start': '192.168.11.2'
+        'end': '192.168.11.254'
+    vlan_id: 101
+    name: 'MANAGEMENT'
+  - cidr: '192.168.12.0/24'
+    gateway: '192.168.12.1'
+    ip_ranges:
+      - 'start': '192.168.12.2'
+        'end': '192.168.12.254'
+    vlan_id: 102
+    name: 'STORAGE'
+  - cidr: '172.10.0.0/24'
+    gateway: '172.10.0.1'
+    ip_ranges:
+      - 'start': '172.10.0.2'
+        'end': '172.10.0.200'
+    vlan_id: 103
+    'name': 'EXTERNAL'
+    network_name: 'admin_external'
+    mapping: 'physnet1'
+  - cidr: '192.168.11.0/24'
+    gateway: '192.168.11.1'
+    ip_ranges:
+      - 'start': '192.168.11.2'
+        'end': '192.168.11.254'
+    vlan_id: 101
+    name: 'PUBLICAPI'
+  - cidr: '192.168.13.0/24'
+    gateway: '192.168.13.1'
+    ip_ranges:
+      - 'start': '192.168.13.2'
+        'end': '192.168.13.254'
+    vlan_id: 1030
+    name: 'TENANT'
+  - cidr: '10.20.0.0/24'
+    gateway: '10.20.0.1'
+    ip_ranges:
+      - 'start': '10.20.0.20'
+        'end': '10.20.0.200'
+    vlan_id: null
+    name: 'HEARTBEAT'
+interfaces:
+  - name: 'EXTERNAL'
+    interface: 'enp132s0f1'
+  - name: 'MANAGEMENT'
+    interface: 'enp2s0f1'
+  - name: 'PUBLICAPI'
+    interface: 'enp2s0f1'
+  - name: 'STORAGE'
+    interface: 'enp132s0f0'
+  - name: 'TENANT'
+    interface: 'enp132s0f1'
+  - name: 'HEARTBEAT'
+    interface: 'enp2s0f0'
+internal_vip: '192.168.11.10'
+public_vip: '10.20.0.11'