Merge "Moving all pdfs to pharos repo"
authorJack Morgan <jack.morgan@intel.com>
Fri, 15 Dec 2017 13:48:16 +0000 (13:48 +0000)
committerGerrit Code Review <gerrit@opnfv.org>
Fri, 15 Dec 2017 13:48:16 +0000 (13:48 +0000)
25 files changed:
INFO
config/installers/daisy/network-dpdk.yaml.j2 [new file with mode: 0644]
config/installers/daisy/network.yaml.j2 [new file with mode: 0644]
config/installers/fuel/pod_config.yml.j2
config/utils/README.eyaml.rst
config/utils/generate_config.py
labs/arm/idf-pod5.yaml [new file with mode: 0644]
labs/arm/idf-pod6.yaml [new file with mode: 0644]
labs/arm/pod5.yaml [new file with mode: 0644]
labs/arm/pod6.yaml [new file with mode: 0644]
labs/intel/pod18.yaml [new file with mode: 0644]
labs/zte/idf-pod1.yaml [new file with mode: 0644]
labs/zte/idf-pod2.yaml [new file with mode: 0644]
labs/zte/idf-pod3.yaml [new file with mode: 0644]
labs/zte/pod1.yaml [new file with mode: 0644]
labs/zte/pod2.yaml [new file with mode: 0644]
labs/zte/pod2/daisy/config/deploy.yml [new file with mode: 0644]
labs/zte/pod2/daisy/config/network.yml [new file with mode: 0644]
labs/zte/pod3.yaml [new file with mode: 0644]
labs/zte/pod3/daisy/config/deploy.yml [new file with mode: 0644]
labs/zte/pod3/daisy/config/network.yml [new file with mode: 0644]
labs/zte/virtual1/daisy/config/deploy.yml [new file with mode: 0644]
labs/zte/virtual1/daisy/config/network.yml [new file with mode: 0644]
labs/zte/virtual2/daisy/config/deploy.yml [new file with mode: 0644]
labs/zte/virtual2/daisy/config/network.yml [new file with mode: 0644]

diff --git a/INFO b/INFO
index 162e88d..54ff322 100644 (file)
--- a/INFO
+++ b/INFO
@@ -12,14 +12,14 @@ Repository: pharos
 
 Committers:
 
-trevor.cooper@intel.com
-fuqiao@chinamobile.com
-Wenjing.Chu@huawei.com
-morgan.richomme@orange.com
-jack.morgan@intel.com
-jose.lausuch@ericsson.com
-fatih.degirmenci@ericsson.com
-zhang.jun3g@zte.com.cn
+
+Fatih Degirmenci <fatih.degirmenci@ericsson.com>
+Jack Morgan <jack.morgan@intel.com>
+Jose Lausuch <jalausuch@suse.com>
+Julien Zhang <zhang.jun3g@zte.com.cn>
+Morgan Richomme <morgan.richomme@orange.com>
+Trevor Cooper <trevor.cooper@intel.com>
+Wenjing Chu <wenjing.chu@huawei.com>
 
 Link to TSC approval of the project: http://meetbot.opnfv.org/meetings/opnfv-meeting/
 Link(s) to approval of additional committers:
diff --git a/config/installers/daisy/network-dpdk.yaml.j2 b/config/installers/daisy/network-dpdk.yaml.j2
new file mode 100644 (file)
index 0000000..507e7cf
--- /dev/null
@@ -0,0 +1,102 @@
+##############################################################################
+# Copyright (c) 2017 ZTE Corporation 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
+##############################################################################
+
+##############################################################################
+# Description
+# MANAGEMENT: used for management
+# STORAGE: used for storage access
+# EXTERNAL: tenant public/floating IP associated network
+# PUBLICAPI: used for horizon access, openstack API access
+# TENANT: used for tenant access, vlan and VxLan supported, default VxLan
+# HEARTBEAT: used for heartbeat, requires a dedicated interface
+##############################################################################
+
+---
+
+network-config-metadata:
+  title: 'Deployment Adapter for baremetal POD'
+  version: '0.1'
+  created: 'Nov 22 2017'
+  comment: 'For Daisy initial'
+
+{%- set mapping = {'HEARTBEAT': 'admin',
+                   'MANAGEMENT': 'mgmt',
+                   'PUBLICAPI': 'mgmt',
+                   'STORAGE': 'storage',
+                   'TENANT': 'public',
+                   'EXTERNAL': 'public'} -%}
+
+{%- if "idf" in conf and ("daisy" in conf["idf"] or "fuel" in conf["idf"]) -%}
+  {%- if "daisy" in conf["idf"] -%}
+    {%- set installer = "daisy" -%}
+  {%- else -%}
+    {%- set installer = "fuel" -%}
+  {%- endif %}
+
+networks:
+
+  {%- set networks = {} -%}
+  {%- for key in mapping -%}
+    {%- set net_data = conf['net_config'][mapping[key]] -%}
+    {%- set interface = net_data['interface'] -%}
+    {%- set interface_name = conf.idf[installer].network.node[0].interfaces[interface] -%}
+    {%- set bus_addr = conf.idf[installer].network.node[0].busaddr[interface] -%}
+    {%- set vlan = net_data['vlan'] -%}
+    {%- if vlan == "native" or vlan == None -%}
+      {%- set vlan = "null" -%}
+    {%- endif -%}
+    {%- set network = net_data['network'] -%}
+    {%- set ips = network.split(".") -%}
+    {%- set mask = net_data['mask'] -%}
+    {%- if 'ip-range' in net_data -%}
+      {%- set ip_range = net_data['ip-range'] -%}
+      {%- set (start, end) = ip_range.split("-") -%}
+    {%- else -%}
+      {%- set start = ".".join([ips[0], ips[1], ips[2], "10"]) -%}
+      {%- set end = ".".join([ips[0], ips[1], ips[2], "200"]) -%}
+    {%- endif -%}
+    {%- set vip = start -%}
+
+    {%- if 'gateway' in net_data -%}
+      {%- set gateway = net_data.gateway -%}
+    {%- else -%}
+      {%- set gateway = ".".join([ips[0], ips[1], ips[2], "1"]) -%}
+    {%- endif -%}
+
+    {%- set networks = networks.update({key: {'interface_name': interface_name,
+                                              'bus_addr': bus_addr,
+                                              'vlan': vlan,
+                                              'network': network,
+                                              'mask': mask,
+                                              'start': start,
+                                              'end': end,
+                                              'vip': vip,
+                                              'gateway': gateway
+                                             }
+                                       }) %}
+
+  - cidr: '{{ network }}/{{ mask }}'
+    gateway: '{{ gateway }}'
+    ip_ranges:
+      - 'start': '{{ start }}'
+        'end': '{{ end }}'
+    vlan_id: {{ vlan }}
+    name: '{{ key }}'
+  {%- endfor %}
+
+interfaces:
+  {%- for key in mapping %}
+  - name: '{{ key }}'
+    interface: '{{ networks[key].interface_name }}'
+  {%- endfor %}
+
+internal_vip: '{{ networks['MANAGEMENT'].vip }}'
+public_vip: '{{ networks['PUBLICAPI'].vip }}'
+
+{%- endif %}
diff --git a/config/installers/daisy/network.yaml.j2 b/config/installers/daisy/network.yaml.j2
new file mode 100644 (file)
index 0000000..9eef739
--- /dev/null
@@ -0,0 +1,102 @@
+##############################################################################
+# Copyright (c) 2017 ZTE Corporation 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
+##############################################################################
+
+##############################################################################
+# Description
+# MANAGEMENT: used for management
+# STORAGE: used for storage access
+# EXTERNAL: tenant public/floating IP associated network
+# PUBLICAPI: used for horizon access, openstack API access
+# TENANT: used for tenant access, vlan and VxLan supported, default VxLan
+# HEARTBEAT: used for heartbeat, requires a dedicated interface
+##############################################################################
+
+---
+
+network-config-metadata:
+  title: 'Deployment Adapter for baremetal POD'
+  version: '0.1'
+  created: 'Nov 22 2017'
+  comment: 'For Daisy initial'
+
+{%- set mapping = {'HEARTBEAT': 'admin',
+                   'MANAGEMENT': 'mgmt',
+                   'PUBLICAPI': 'mgmt',
+                   'STORAGE': 'storage',
+                   'TENANT': 'private',
+                   'EXTERNAL': 'public'} -%}
+
+{%- if "idf" in conf and ("daisy" in conf["idf"] or "fuel" in conf["idf"]) -%}
+  {%- if "daisy" in conf["idf"] -%}
+    {%- set installer = "daisy" -%}
+  {%- else -%}
+    {%- set installer = "fuel" -%}
+  {%- endif %}
+
+networks:
+
+  {%- set networks = {} -%}
+  {%- for key in mapping -%}
+    {%- set net_data = conf['net_config'][mapping[key]] -%}
+    {%- set interface = net_data['interface'] -%}
+    {%- set interface_name = conf.idf[installer].network.node[0].interfaces[interface] -%}
+    {%- set bus_addr = conf.idf[installer].network.node[0].busaddr[interface] -%}
+    {%- set vlan = net_data['vlan'] -%}
+    {%- if vlan == "native" or vlan == None -%}
+      {%- set vlan = "null" -%}
+    {%- endif -%}
+    {%- set network = net_data['network'] -%}
+    {%- set ips = network.split(".") -%}
+    {%- set mask = net_data['mask'] -%}
+    {%- if 'ip-range' in net_data -%}
+      {%- set ip_range = net_data['ip-range'] -%}
+      {%- set (start, end) = ip_range.split("-") -%}
+    {%- else -%}
+      {%- set start = ".".join([ips[0], ips[1], ips[2], "10"]) -%}
+      {%- set end = ".".join([ips[0], ips[1], ips[2], "200"]) -%}
+    {%- endif -%}
+    {%- set vip = start -%}
+
+    {%- if 'gateway' in net_data -%}
+      {%- set gateway = net_data.gateway -%}
+    {%- else -%}
+      {%- set gateway = ".".join([ips[0], ips[1], ips[2], "1"]) -%}
+    {%- endif -%}
+
+    {%- set networks = networks.update({key: {'interface_name': interface_name,
+                                              'bus_addr': bus_addr,
+                                              'vlan': vlan,
+                                              'network': network,
+                                              'mask': mask,
+                                              'start': start,
+                                              'end': end,
+                                              'vip': vip,
+                                              'gateway': gateway
+                                             }
+                                       }) %}
+
+  - cidr: '{{ network }}/{{ mask }}'
+    gateway: '{{ gateway }}'
+    ip_ranges:
+      - 'start': '{{ start }}'
+        'end': '{{ end }}'
+    vlan_id: {{ vlan }}
+    name: '{{ key }}'
+  {%- endfor %}
+
+interfaces:
+  {%- for key in mapping %}
+  - name: '{{ key }}'
+    interface: '{{ networks[key].interface_name }}'
+  {%- endfor %}
+
+internal_vip: '{{ networks['MANAGEMENT'].vip }}'
+public_vip: '{{ networks['PUBLICAPI'].vip }}'
+
+{%- endif %}
index c2f1403..28c6188 100644 (file)
@@ -8,6 +8,10 @@
     {%- if conf.net_config.public.dns is defined -%}
         {%- set dns_public = conf['net_config']['public']['dns'] -%}
     {%- endif -%}
+    {%- set pxe_interface = conf['net_config']['admin']['interface'] -%}
+    {%- if conf.net_config.public.gateway is defined -%}
+        {%- set net_public_gw = conf['net_config']['public']['gateway'] -%}
+    {%- endif -%}
 {%- else -%}
     {%- set net_admin = '192.168.11.0' -%}
     {%- set net_mgmt = '172.16.10.0' -%}
     {%- set net_public = '172.30.10.0' -%}
     {%- set vlan_mgmt = '300' -%}
     {%- set vlan_private = '1000' -%}
+    {%- set pxe_interface = 0 -%}
 {%- endif -%}
 
 {%- if dns_public is not defined -%}
     {%- set dns_public = [ '8.8.8.8', '8.8.4.4' ] -%}
 {%- endif -%}
-
-{%- set pxe_interface = 0 -%}
+{%- if net_public_gw is not defined -%}
+    {%- set net_public_gw =  net_public | ipaddr_index('1')  -%}
+{%- endif -%}
 ---
 parameters:
   _param:
 
+{%- if conf.idf is defined %}
+    opnfv_jump_bridge_admin: {{ conf['idf']['fuel']['jumphost']['bridges']['admin'] }}
+    opnfv_jump_bridge_mgmt: {{ conf['idf']['fuel']['jumphost']['bridges']['mgmt'] }}
+    opnfv_jump_bridge_private: {{ conf['idf']['fuel']['jumphost']['bridges']['private'] }}
+    opnfv_jump_bridge_public: {{ conf['idf']['fuel']['jumphost']['bridges']['public'] }}
+{%- endif %}
+
     opnfv_infra_config_address: {{ net_mgmt | ipaddr_index('100') }}
     opnfv_infra_maas_node01_address: {{ net_mgmt | ipaddr_index('3') }}
     opnfv_infra_maas_node01_deploy_address: {{ net_admin | ipaddr_index('3') }}
-    opnfv_infra_compute_node01_address: {{ net_mgmt | ipaddr_index('141') }}
-    opnfv_infra_compute_node02_address: {{ net_mgmt | ipaddr_index('142') }}
-    opnfv_infra_compute_node03_address: {{ net_mgmt | ipaddr_index('143') }}
     opnfv_infra_kvm_address: {{ net_mgmt | ipaddr_index('140') }}
     opnfv_infra_kvm_node01_address: {{ net_mgmt | ipaddr_index('141') }}
     opnfv_infra_kvm_node02_address: {{ net_mgmt | ipaddr_index('142') }}
     opnfv_infra_kvm_node03_address: {{ net_mgmt | ipaddr_index('143') }}
 
+    opnfv_infra_maas_pxe_network_address: {{ net_admin }}
+    opnfv_infra_maas_pxe_address: {{ net_admin | ipaddr_index('3') }}
+    opnfv_infra_maas_pxe_start_address: {{ net_admin | ipaddr_index('5') }}
+    opnfv_infra_maas_pxe_end_address: {{ net_admin | ipaddr_index('250') }}
+
     opnfv_openstack_gateway_node01_address: {{ net_mgmt | ipaddr_index('124') }}
     opnfv_openstack_gateway_node02_address: {{ net_mgmt | ipaddr_index('125') }}
     opnfv_openstack_gateway_node03_address: {{ net_mgmt | ipaddr_index('126') }}
@@ -46,6 +61,8 @@ parameters:
     opnfv_openstack_proxy_address: {{ net_public | ipaddr_index('103') }}
     opnfv_openstack_proxy_node01_address: {{ net_public | ipaddr_index('104') }}
     opnfv_openstack_proxy_node02_address: {{ net_public | ipaddr_index('105') }}
+    opnfv_openstack_proxy_node01_control_address: {{ net_mgmt | ipaddr_index('104') }}
+    opnfv_openstack_proxy_node02_control_address: {{ net_mgmt | ipaddr_index('105') }}
     opnfv_openstack_control_address: {{ net_mgmt | ipaddr_index('10') }}
     opnfv_openstack_control_node01_address: {{ net_mgmt | ipaddr_index('11') }}
     opnfv_openstack_control_node02_address: {{ net_mgmt | ipaddr_index('12') }}
@@ -76,6 +93,7 @@ parameters:
 
     opnfv_opendaylight_server_node01_single_address: {{ net_mgmt | ipaddr_index('111') }}
 
+    opnfv_net_public_gw: {{ net_public_gw }}
     opnfv_name_servers: {{ dns_public }}
     opnfv_dns_server01: '{{ dns_public[0] }}'
 
@@ -83,35 +101,35 @@ parameters:
     opnfv_net_tenant_vlan: {{ vlan_private }}
 
     opnfv_maas_node01_architecture: '{{ conf['nodes'][0]['node']['arch'] | dpkg_arch }}/generic'
-    opnfv_maas_node01_power_address: {{ conf['nodes'][0]['remote_management']['address'] }}
+    opnfv_maas_node01_power_address: {{ conf['nodes'][0]['remote_management']['address'].rsplit('/')[0]}}
     opnfv_maas_node01_power_type: {{ conf['nodes'][0]['remote_management']['type'] }}
     opnfv_maas_node01_power_user: {{ conf['nodes'][0]['remote_management']['user'] }}
     opnfv_maas_node01_power_password: {{ conf['nodes'][0]['remote_management']['pass'] }}
     opnfv_maas_node01_interface_mac: '{{ conf['nodes'][0]['interfaces'][pxe_interface]['mac_address'] }}'
 
     opnfv_maas_node02_architecture: '{{ conf['nodes'][1]['node']['arch'] | dpkg_arch }}/generic'
-    opnfv_maas_node02_power_address: {{ conf['nodes'][1]['remote_management']['address'] }}
+    opnfv_maas_node02_power_address: {{ conf['nodes'][1]['remote_management']['address'].rsplit('/')[0] }}
     opnfv_maas_node02_power_type: {{ conf['nodes'][1]['remote_management']['type'] }}
     opnfv_maas_node02_power_user: {{ conf['nodes'][1]['remote_management']['user'] }}
     opnfv_maas_node02_power_password: {{ conf['nodes'][1]['remote_management']['pass'] }}
     opnfv_maas_node02_interface_mac: '{{ conf['nodes'][1]['interfaces'][pxe_interface]['mac_address'] }}'
 
     opnfv_maas_node03_architecture: '{{ conf['nodes'][2]['node']['arch'] | dpkg_arch }}/generic'
-    opnfv_maas_node03_power_address: {{ conf['nodes'][2]['remote_management']['address'] }}
+    opnfv_maas_node03_power_address: {{ conf['nodes'][2]['remote_management']['address'].rsplit('/')[0] }}
     opnfv_maas_node03_power_type: {{ conf['nodes'][2]['remote_management']['type'] }}
     opnfv_maas_node03_power_user: {{ conf['nodes'][2]['remote_management']['user'] }}
     opnfv_maas_node03_power_password: {{ conf['nodes'][2]['remote_management']['pass'] }}
     opnfv_maas_node03_interface_mac: '{{ conf['nodes'][2]['interfaces'][pxe_interface]['mac_address'] }}'
 
     opnfv_maas_node04_architecture: '{{ conf['nodes'][3]['node']['arch'] | dpkg_arch }}/generic'
-    opnfv_maas_node04_power_address: {{ conf['nodes'][3]['remote_management']['address'] }}
+    opnfv_maas_node04_power_address: {{ conf['nodes'][3]['remote_management']['address'].rsplit('/')[0] }}
     opnfv_maas_node04_power_type: {{ conf['nodes'][3]['remote_management']['type'] }}
     opnfv_maas_node04_power_user: {{ conf['nodes'][3]['remote_management']['user'] }}
     opnfv_maas_node04_power_password: {{ conf['nodes'][3]['remote_management']['pass'] }}
     opnfv_maas_node04_interface_mac: '{{ conf['nodes'][3]['interfaces'][pxe_interface]['mac_address'] }}'
 
     opnfv_maas_node05_architecture: '{{ conf['nodes'][4]['node']['arch'] | dpkg_arch }}/generic'
-    opnfv_maas_node05_power_address: {{ conf['nodes'][4]['remote_management']['address'] }}
+    opnfv_maas_node05_power_address: {{ conf['nodes'][4]['remote_management']['address'].rsplit('/')[0] }}
     opnfv_maas_node05_power_type: {{ conf['nodes'][4]['remote_management']['type'] }}
     opnfv_maas_node05_power_user: {{ conf['nodes'][4]['remote_management']['user'] }}
     opnfv_maas_node05_power_password: {{ conf['nodes'][4]['remote_management']['pass'] }}
index 083d519..0031d9d 100644 (file)
@@ -12,7 +12,7 @@ Prerequisites
 
     .. code-block:: bash
 
-        $ sudo yum install ruby-gems || sudo apt-get install ruby
+        $ sudo yum install rubygems || sudo apt-get install ruby
         $ sudo gem install hiera-eyaml
         $ eyaml createkeys
 
@@ -22,13 +22,14 @@ Prerequisites
 
         $ sudo mkdir -p /etc/eyaml_keys/
         $ sudo mv ./keys/* /etc/eyaml_keys/
+        $ sudo rmdir ./keys
 
 #. Set up eyaml config.yaml
 
     .. code-block:: bash
 
         $ mkdir ~/.eyaml/
-        $ cp config.yaml.example ~/.eyaml/config.yaml
+        $ cp config.example.yaml ~/.eyaml/config.yaml
 
 Encryption
 ----------
index ba4192c..3710880 100755 (executable)
@@ -57,9 +57,13 @@ ENV.filters['dpkg_arch'] = dpkg_arch
 try:
     DICT = yaml.safe_load(check_output(['eyaml', 'decrypt', '-f', ARGS.yaml]))
 except CalledProcessError as ex:
-    pass
-if not DICT:
-    logging.warn('PDF decryption failed, fallback to using raw data.')
+    logging.error('eyaml decryption failed, keys might be missing')
+except OSError as ex:
+    logging.warn('eyaml not found, skipping decryption')
+try:
+    DICT
+except NameError as ex:
+    logging.warn('PDF decryption skipped, fallback to using raw data.')
     with open(ARGS.yaml) as _:
         DICT = yaml.safe_load(_)
 
diff --git a/labs/arm/idf-pod5.yaml b/labs/arm/idf-pod5.yaml
new file mode 100644 (file)
index 0000000..52ea6ed
--- /dev/null
@@ -0,0 +1,38 @@
+##############################################################################
+# Copyright (c) 2017 Enea AB 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
+##############################################################################
+---
+### ARM POD 5 installer descriptor file ###
+
+idf:
+  version: 0.1
+  fuel:
+    jumphost:
+      bridges:
+        admin: 'admin7_br0'
+        mgmt: 'mgmt7_br0'
+        private: ''
+        public: 'public7_br0'
+    network:
+      node:
+        # Ordered-list, index should be in sync with node index in PDF
+        - interfaces: &interfaces
+            # Ordered-list, index should be in sync with interface index in PDF
+            - 'eth0'
+            - 'eth1'
+          busaddr: &busaddr
+            # Bus-info reported by `ethtool -i ethX`
+            - 'e0700000.xgmac'
+            - 'e0900000.xgmac'
+        - interfaces: *interfaces
+          busaddr: *busaddr
+        - interfaces: *interfaces
+          busaddr: *busaddr
+        - interfaces: *interfaces
+          busaddr: *busaddr
+        - interfaces: *interfaces
+          busaddr: *busaddr
diff --git a/labs/arm/idf-pod6.yaml b/labs/arm/idf-pod6.yaml
new file mode 100644 (file)
index 0000000..db03686
--- /dev/null
@@ -0,0 +1,46 @@
+##############################################################################\r
+# Copyright (c) 2017 Enea AB and others.\r
+# All rights reserved. This program and the accompanying materials\r
+# are made available under the terms of the Apache License, Version 2.0\r
+# which accompanies this distribution, and is available at\r
+# http://www.apache.org/licenses/LICENSE-2.0\r
+##############################################################################\r
+---\r
+### ARM POD 6 installer descriptor file ###\r
+\r
+idf:\r
+  version: 0.1\r
+  fuel:\r
+    jumphost:\r
+      bridges:\r
+        admin: 'admin14_br0'\r
+        mgmt: 'mgmt14_br0'\r
+        private: ''\r
+        public: 'public14_br0'\r
+    network:\r
+      node:\r
+        # Ordered-list, index should be in sync with node index in PDF\r
+        - interfaces: &interfaces\r
+            # Ordered-list, index should be in sync with interface index in PDF\r
+            - 'enP5p144s0'\r
+            - 'enP2p1s0f1'\r
+            - 'enP2p1s0f2'\r
+            - 'enP2p1s0f3'\r
+            - 'enP2p1s0f4'\r
+            - 'enP2p1s0f5'\r
+          busaddr: &busaddr\r
+            # Bus-info reported by `ethtool -i ethX`\r
+            - '0005:90:00.0'\r
+            - '0002:01:00.1'\r
+            - '0002:01:00.2'\r
+            - '0002:01:00.3'\r
+            - '0002:01:00.4'\r
+            - '0002:01:00.5'\r
+        - interfaces: *interfaces\r
+          busaddr: *busaddr\r
+        - interfaces: *interfaces\r
+          busaddr: *busaddr\r
+        - interfaces: *interfaces\r
+          busaddr: *busaddr\r
+        - interfaces: *interfaces\r
+          busaddr: *busaddr\r
diff --git a/labs/arm/pod5.yaml b/labs/arm/pod5.yaml
new file mode 100644 (file)
index 0000000..7ee358f
--- /dev/null
@@ -0,0 +1,209 @@
+---
+### Enea ARM POD 5 descriptor file ###
+
+details:
+  pod_owner: ENEA AB
+  contact: dan.lilliehorn@enea.com
+  lab: ENEA lab
+  location: Stockholm, Sweden
+  type: production
+  link: https://wiki.opnfv.org/display/pharos/Enea+Hosting
+##############################################################################
+net_config:
+  oob:
+    ip-range: 10.0.8.3-10.0.8.10
+    vlan: native
+  admin:
+    interface: 0
+    vlan: native
+    network: 192.168.11.0
+    mask: 24
+  mgmt:
+    interface: 1
+    vlan: 2183
+    network: 172.16.10.0
+    mask: 24
+  storage:
+    interface: 1
+    vlan: 2184
+    network: 10.2.0.0
+    mask: 24
+  private:
+    interface: 1
+    vlan: 2185
+    network: 10.1.0.0
+    mask: 24
+  public:
+    interface: 1
+    vlan: native
+    network: 10.0.8.0
+    mask: 24
+    gateway: 10.0.8.254
+    dns:
+      - 8.8.8.8
+      - 8.8.4.4
+##############################################################################
+jumphost:
+  name: jenkins-slave-arm-pod5
+  node:
+    type: baremetal
+    vendor: Cavium
+    model: ThunderX
+    arch: aarch64
+    cpus: 1
+    cpu_cflags: fp asimd evtstrm aes pmull sha1 sha2 crc32
+    cores: 48
+    memory: 128G
+  disks:
+    - name: disk1
+      disk_capacity: 500G
+      disk_type: hdd
+      disk_interface: sata
+      disk_rotation: 7200
+  os: ubuntu-16.04
+  remote_params: &remote_params
+    type: ipmi
+    versions:
+      - 2.0
+    user: admin
+    pass: admin
+  remote_management:
+    <<: *remote_params
+    address: 10.0.1.32
+    mac_address: "40:8D:5C:BA:B9:6A"
+  interfaces:
+    # Connected, used only for admin/PXE
+    - mac_address: "68:05:ca:34:60:e3"
+      speed: 1gb
+      features: ''
+    # Not connected for now
+    - mac_address: "00:0f:b7:04:00:c1"
+      speed: 40gb
+      features: 'dpdk|sriov'
+    # Not connected for now
+    - mac_address: "00:0f:b7:04:00:c2"
+      speed: 40gb
+      features: 'dpdk|sriov'
+    # Connected, trunk for all other VLANs
+    - mac_address: "00:0f:b7:04:00:c0"
+      speed: 10gb
+      features: ''
+  fixed_ips:
+    admin: 192.168.11.1
+    mgmt: 172.16.10.1
+    public: 10.0.8.9
+##############################################################################
+nodes:
+  - name: softiron-3
+    node: &nodeparams
+      type: baremetal
+      vendor: Softiron
+      model: Overdrive 3000
+      arch: aarch64
+      cpus: 1
+      cpu_cflags: fp asimd evtstrm aes pmull sha1 sha2 crc32
+      cores: 8
+      memory: 32G
+    disks: &disks
+      - name: 'disk1'
+        disk_capacity: 128G
+        disk_type: ssd
+        disk_interface: sata
+      - name: 'disk2'
+        disk_capacity: 2048G
+        disk_type: hdd
+        disk_interface: sata
+        disk_rotation: 7200
+    remote_management:
+      <<: *remote_params
+      address: 10.0.8.3
+      mac_address: "e0:ff:f7:00:04:99"
+    interfaces:
+      # Connected, used only for admin/PXE
+      - mac_address: "e0:ff:f7:00:08:ae"
+        speed: 10gb
+        features: ''
+      # Connected, trunk for all other VLANs
+      - mac_address: "e0:ff:f7:00:08:af"
+        speed: 10gb
+        features: ''
+    fixed_ips:
+      admin: 192.168.11.2
+      mgmt: 172.16.10.141
+      public: 10.0.8.141
+  ############################################################################
+  - name: softiron-4
+    node: *nodeparams
+    disk: *disks
+    remote_management:
+      <<: *remote_params
+      address: 10.0.8.4
+      mac_address: "e0:ff:f7:00:05:00"
+    interfaces:
+      - mac_address: "e0:ff:f7:00:08:b1"
+        speed: 10gb
+        features: ''
+      - mac_address: "e0:ff:f7:00:08:b2"
+        speed: 10gb
+        features: ''
+    fixed_ips:
+      admin: 192.168.11.3
+      mgmt: 172.16.10.142
+      public: 10.0.8.142
+  ############################################################################
+  - name: softiron-5
+    node: *nodeparams
+    disk: *disks
+    remote_management:
+      <<: *remote_params
+      address: 10.0.8.5
+      mac_address: "e0:ff:f7:00:04:a9"
+    interfaces:
+      - mac_address: "e0:ff:f7:00:08:bd"
+        speed: 10gb
+        features: ''
+      - mac_address: "e0:ff:f7:00:08:be"
+        speed: 10gb
+        features: ''
+    fixed_ips:
+      admin: 192.168.11.4
+      mgmt: 172.16.10.143
+      public: 10.0.8.143
+  ############################################################################
+  - name: softiron-6
+    node: *nodeparams
+    disk: *disks
+    remote_management:
+      <<: *remote_params
+      address: 10.0.8.6
+      mac_address: "e0:ff:f7:00:04:78"
+    interfaces:
+      - mac_address: "e0:ff:f7:00:08:c6"
+        speed: 10gb
+        features: ''
+      - mac_address: "e0:ff:f7:00:08:c7"
+        speed: 10gb
+        features: ''
+    fixed_ips:
+      admin: 192.168.11.5
+      mgmt: 172.16.10.101
+      public: 10.0.8.101
+  ############################################################################
+  - name: softiron-7
+    node: *nodeparams
+    disk: *disks
+    remote_management:
+      <<: *remote_params
+      address: 10.0.8.7
+      mac_address: "e0:ff:f7:00:05:19"
+    interfaces:
+      - mac_address: "e0:ff:f7:00:08:cf"
+        speed: 10gb
+        features: ''
+      - mac_address: "e0:ff:f7:00:08:d0"
+        speed: 10gb
+        features: ''
+    fixed_ips:
+      admin: 192.168.11.6
+      mgmt: 172.16.10.102
+      public: 10.0.8.102
diff --git a/labs/arm/pod6.yaml b/labs/arm/pod6.yaml
new file mode 100644 (file)
index 0000000..f4f92dd
--- /dev/null
@@ -0,0 +1,280 @@
+---
+### Enea ARM POD 6 descriptor file ###
+
+details:
+  pod_owner: ENEA AB
+  contact: dan.lilliehorn@enea.com
+  lab: ENEA lab
+  location: Stockholm, Sweden
+  type: production
+  link: https://wiki.opnfv.org/display/pharos/Enea+Hosting
+##############################################################################
+net_config:
+  oob:
+    ip-range: 10.0.1.54-10.0.1.58
+    vlan: native
+  admin:
+    interface: 0
+    vlan: native
+    network: 192.168.11.0
+    mask: 24
+  mgmt:
+    interface: 1
+    vlan: 2323
+    network: 172.16.10.0
+    mask: 24
+  storage:
+    interface: 1
+    vlan: 2324
+    network: 10.2.0.0
+    mask: 24
+  private:
+    interface: 1
+    vlan: 2325
+    network: 10.1.0.0
+    mask: 24
+  public:
+    interface: 1
+    vlan: native
+    network: 10.0.15.0
+    mask: 24
+    gateway: 10.0.15.254
+    dns:
+      - 8.8.8.8
+      - 8.8.4.4
+##############################################################################
+jumphost:
+  name: jenkins-slave-arm-pod6
+  node:
+    type: baremetal
+    vendor: AppliedMicro
+    model: XGene 1
+    arch: aarch64
+    cpus: 1
+    cpu_cflags: fp asimd evtstrm
+    cores: 8
+    memory: 32G
+  disks:
+    ## /dev/sda
+    - name: disk1
+      disk_capacity: 120G
+      disk_type: ssd
+      disk_interface: sata
+    ## /dev/sdb
+    - name: disk2
+      disk_capacity: 1T
+      disk_type: hdd
+      disk_interface: sata
+      disk_rotation: 7200
+    ## /dev/sdc
+    - name: disk3
+      disk_capacity: 1T
+      disk_type: hdd
+      disk_interface: sata
+      disk_rotation: 7200
+  os: ubuntu-16.04
+  remote_params: &remote_params
+    type: ipmi
+    versions:
+      - 2.0
+    user: ADMIN
+    pass: ADMIN
+  remote_management:
+    <<: *remote_params
+    address: 0.0.0.0
+    mac_address: "00:00:00:00:00:00"
+  interfaces:
+    ## eth0, Not connected for now
+    - mac_address: "00:01:73:02:36:d4"
+      speed: 1gb
+      features: ''
+    ## eth1, Connected, used only for admin/PXE
+    - mac_address: "00:01:73:02:36:d5"
+      speed: 1gb
+      features: ''
+    ## eth2, Not connected for now
+    - mac_address: "00:01:73:02:36:d6"
+      speed: 1gb
+      features: ''
+    ## eth3, Connected, trunk for all other VLANs
+    - mac_address: "00:01:73:02:36:d7"
+      speed: 10gb
+      features: ''
+  fixed_ips:
+    admin: 192.168.11.1
+    mgmt: 172.16.10.1
+    public: 10.0.15.9
+##############################################################################
+nodes:
+  - name: cn8890-24
+    node: &nodeparams
+      type: baremetal
+      vendor: Cavium
+      model: ThunderX
+      arch: aarch64
+      cpus: 1
+      cpu_cflags: fp asimd evtstrm aes pmull sha1 sha2 crc32
+      cores: 48
+      memory: 62G
+    disks: &disks
+      - name: 'disk1'
+        disk_capacity: 480G
+        disk_type: ssd
+        disk_interface: sata
+    remote_management:
+      <<: *remote_params
+      address: 10.0.1.54
+      mac_address: "1c:1b:0d:e8:fa:8b"
+    interfaces:
+      ## enP5p144s0, Connected, used only for admin/PXE
+      - mac_address: "68:05:ca:5a:c3:a7"
+        speed: 1gb
+        features: ''
+      ## enP2p1s0f1, Connected, trunk for all other VLANs
+      - mac_address: "1c:1b:0d:e8:fa:83"
+        speed: 10gb
+        features: 'dpdk|sriov'
+      ## enP2p1s0f2, Not connected for now
+      - mac_address: "1c:1b:0d:e8:fa:84"
+        speed: 10gb
+        features: 'dpdk|sriov'
+      ## enP2p1s0f3, Not connected for now
+      - mac_address: "1c:1b:0d:e8:fa:85"
+        speed: 10gb
+        features: 'dpdk|sriov'
+      ## enP2p1s0f4, Not connected for now
+      - mac_address: "1c:1b:0d:e8:fa:86"
+        speed: 10gb
+        features: 'dpdk|sriov'
+      ## enP2p1s0f5, Not connected for now
+      - mac_address: "1c:1b:0d:e8:fa:87"
+        speed: 10gb
+        features: 'dpdk|sriov'
+    fixed_ips:
+      admin: 192.168.11.2
+      mgmt: 172.16.10.142
+      public: 10.0.15.142
+  ############################################################################
+  - name: cn8890-25
+    node: *nodeparams
+    disk: *disks
+    remote_management:
+      <<: *remote_params
+      address: 10.0.1.55
+      mac_address: "1c:1b:0d:e8:fa:ad"
+    interfaces:
+      - mac_address: "68:05:ca:5a:c3:bc"
+        speed: 1gb
+        features: ''
+      - mac_address: "1c:1b:0d:e8:fb:a5"
+        speed: 10gb
+        features: 'dpdk|sriov'
+      - mac_address: "1c:1b:0d:e8:fb:a6"
+        speed: 10gb
+        features: 'dpdk|sriov'
+      - mac_address: "1c:1b:0d:e8:fb:a7"
+        speed: 10gb
+        features: 'dpdk|sriov'
+      - mac_address: "1c:1b:0d:e8:fb:a8"
+        speed: 10gb
+        features: 'dpdk|sriov'
+      - mac_address: "1c:1b:0d:e8:fb:a9"
+        speed: 10gb
+        features: 'dpdk|sriov'
+    fixed_ips:
+      admin: 192.168.11.3
+      mgmt: 172.16.10.143
+      public: 10.0.15.143
+  ############################################################################
+  - name: cn8890-26
+    node: *nodeparams
+    disk: *disks
+    remote_management:
+      <<: *remote_params
+      address: 10.0.1.56
+      mac_address: "1c:1b:0d:e8:fa:6d"
+    interfaces:
+      - mac_address: "68:05:ca:61:b9:00"
+        speed: 1gb
+        features: ''
+      - mac_address: "1c:1b:0d:e8:fa:65"
+        speed: 10gb
+        features: 'dpdk|sriov'
+      - mac_address: "1c:1b:0d:e8:fa:66"
+        speed: 10gb
+        features: 'dpdk|sriov'
+      - mac_address: "1c:1b:0d:e8:fa:67"
+        speed: 10gb
+        features: 'dpdk|sriov'
+      - mac_address: "1c:1b:0d:e8:fa:68"
+        speed: 10gb
+        features: 'dpdk|sriov'
+      - mac_address: "1c:1b:0d:e8:fa:69"
+        speed: 10gb
+        features: 'dpdk|sriov'
+    fixed_ips:
+      admin: 192.168.11.4
+      mgmt: 172.16.10.144
+      public: 10.0.15.144
+  ############################################################################
+  - name: cn8890-27
+    node: *nodeparams
+    disk: *disks
+    remote_management:
+      <<: *remote_params
+      address: 10.0.1.57
+      mac_address: "1c:1b:0d:e8:fb:21"
+    interfaces:
+      - mac_address: "68:05:ca:57:f7:16"
+        speed: 1gb
+        features: ''
+      - mac_address: "1c:1b:0d:e8:fb:19"
+        speed: 10gb
+        features: 'dpdk|sriov'
+      - mac_address: "1c:1b:0d:e8:fb:1a"
+        speed: 10gb
+        features: 'dpdk|sriov'
+      - mac_address: "1c:1b:0d:e8:fb:1b"
+        speed: 10gb
+        features: 'dpdk|sriov'
+      - mac_address: "1c:1b:0d:e8:fb:1c"
+        speed: 10gb
+        features: 'dpdk|sriov'
+      - mac_address: "1c:1b:0d:e8:fb:1d"
+        speed: 10gb
+        features: 'dpdk|sriov'
+    fixed_ips:
+      admin: 192.168.11.5
+      mgmt: 172.16.10.145
+      public: 10.0.15.145
+  ############################################################################
+  - name: cn8890-28
+    node: *nodeparams
+    disk: *disks
+    remote_management:
+      <<: *remote_params
+      address: 10.0.1.58
+      mac_address: "1c:1b:0d:e8:fb:85"
+    interfaces:
+      - mac_address: "68:05:ca:61:97:5a"
+        speed: 1gb
+        features: ''
+      - mac_address: "1c:1b:0d:e8:fb:7d"
+        speed: 10gb
+        features: 'dpdk|sriov'
+      - mac_address: "1c:1b:0d:e8:fb:7e"
+        speed: 10gb
+        features: 'dpdk|sriov'
+      - mac_address: "1c:1b:0d:e8:fb:7f"
+        speed: 10gb
+        features: 'dpdk|sriov'
+      - mac_address: "1c:1b:0d:e8:fb:80"
+        speed: 10gb
+        features: 'dpdk|sriov'
+      - mac_address: "1c:1b:0d:e8:fb:81"
+        speed: 10gb
+        features: 'dpdk|sriov'
+    fixed_ips:
+      admin: 192.168.11.6
+      mgmt: 172.16.10.146
+      public: 10.0.15.146
diff --git a/labs/intel/pod18.yaml b/labs/intel/pod18.yaml
new file mode 100644 (file)
index 0000000..cc95697
--- /dev/null
@@ -0,0 +1,294 @@
+---
+
+### POD descriptor file ###
+
+details:
+  pod_owner: Jack Morgan
+  contact: jack.morgan@intel.com
+  lab: Intel Pharos Lab
+  location: Portland, Oregon, USA
+  type: {production|development}
+  link: http://wiki.opnfv.org/display/pharos/Intel+Hosting
+
+jumphost:
+  name: pod18-jump
+  node:
+    type: baremetal
+    vendor: Intel
+    model: S2600WT
+    arch: x86_64
+    cpus: 2
+    cpu_cflags: broadwell
+    cores: 88
+    memory: 128G
+  disks:
+    - name: 'disk1'
+      disk_capacity: 480GB
+      disk_type: ssd
+      disk_interface: ssd
+      disk_rotation:
+    - name: 'disk2'
+      disk_capacity: 1TB
+      disk_type: hdd
+      disk_interface: sas
+      disk_rotation: 15000
+  os: centos-7.2.1611
+  remote_params: &remoteparas
+    type: ipmi
+    versions:
+      - 1.0
+      - 2.0
+    user:
+    pass:
+  remote_management:
+    <<: *remoteparas
+    address: 10.10.180.10
+    mac_address: "A4:BF:01:16:31:98"
+  interfaces:
+    - nic: 'nic1'
+      address: 10.10.180.20/24
+      mac_address: "A4:BF:01:16:31:96"
+      vlan: native
+    - nic: 'nic2'
+      address: 10.10.181.20/24
+      mac_address: "A4:BF:01:16:31:97"
+      vlan: native
+nodes:
+  - name: pod18-node1
+    node: &nodeparas
+      type: baremetal
+      vendor: Intel
+      model: S2600WT
+      arch: x86_64
+      cpus: 2
+      cpu_cflags: broadwell
+      cores: 88
+      memory: 128G
+    disks: &disks
+      - name: 'disk1'
+        disk_capacity: 480GB
+        disk_type: ssd
+        disk_interface: ssd
+        disk_rotation:
+      - name: 'disk2'
+        disk_capacity: 1TB
+        disk_type: hdd
+        disk_interface: sas
+        disk_rotation: 15000
+    remote_management:
+      <<: *remoteparas
+      address: 10.10.180.11/24
+      mac_address: "A4:BF:01:14:40:18"
+    interfaces:
+      - name: 'nic1'
+        speed: 1gb
+        features:
+        address: 10.10.180.21/24
+        mac_address: "A4:BF:01:14:40:16"
+        vlan: native
+      - name: 'nic2'
+        speed: 1gb
+        features:
+        address: 10.10.181.21/24
+        mac_address: "A4:BF:01:14:40:17"
+        vlan: native
+      - name: 'nic3'
+        speed: 10gb
+        features: 'dpdk|sriov'
+        address: 10.10.182.21/24
+        mac_address: "3C:FD:FE:A4:9F:A0"
+        vlan: native
+      - name: 'nic4'
+        speed: 10gb
+        features: 'dpdk|sriov'
+        address: 10.10.183.21/24
+        mac_address: "3C:FD:FE:A4:9F:A1"
+        vlan: native
+      - name: 'nic5'
+        speed: 10gb
+        features: 'dpdk|sriov'
+        address: 10.10.184.21/24
+        mac_address: "3C:FD:FE:A4:9F:A2"
+        vlan: native
+      - name: 'nic6'
+        speed: 10gb
+        features: 'dpdk|sriov'
+        address: 10.10.185.21/24
+        mac_address: "3C:FD:FE:A4:9F:A3"
+        vlan: native
+  - name: pod18-node2
+    node: *nodeparas
+    disks: *disks
+    remote_management:
+      <<: *remoteparas
+      address: 10.10.180.12/24
+      mac_address: "A4:BF:01:16:31:1G"
+    interfaces:
+      - name: 'nic1'
+        speed: 1gb
+        features:
+        address: 10.10.180.22/24
+        mac_address: "A4:BF:01:16:31:1E"
+        vlan: native
+      - name: 'nic2'
+        speed: 1gb
+        features:
+        address: 10.10.181.22/24
+        mac_address: "A4:BF:01:16:31:1F"
+        vlan: native
+      - name: 'nic3'
+        speed: 10gb
+        features: 'dpdk|sriov'
+        address: 10.10.182.22/24
+        mac_address: "3C:FD:FE:A4:A0:30"
+        vlan: native
+      - name: 'nic4'
+        speed: 10gb
+        features: 'dpdk|sriov'
+        address: 10.10.183.22/24
+        mac_address: "3C:FD:FE:A4:A0:31"
+        vlan: native
+      - name: 'nic5'
+        speed: 10gb
+        features: 'dpdk|sriov'
+        address: 10.10.184.22/24
+        mac_address: "3C:FD:FE:A4:A0:32"
+        vlan: native
+      - name: 'nic6'
+        speed: 10gb
+        features: 'dpdk|sriov'
+        address: 10.10.185.22/24
+        mac_address: "3C:FD:FE:A4:A0:33"
+        vlan: native
+  - name: pod18-node3
+    node: *nodeparas
+    disks: *disks
+    remote_management:
+      <<: *remoteparas
+      address: 10.10.180.13/24
+      mac_address: "A4:BF:01:16:30:F8"
+    interfaces:
+      - name: 'nic1'
+        speed: 1gb
+        features:
+        address: 10.10.180.23/24
+        mac_address: "A4:BF:01:16:30:F6"
+        vlan: native
+      - name: 'nic2'
+        speed: 1gb
+        features:
+        address: 10.10.181.23/24
+        mac_address: "A4:BF:01:16:30:F7"
+        vlan: native
+      - name: 'nic3'
+        speed: 10gb
+        features: 'dpdk|sriov'
+        address: 10.10.182.23/24
+        mac_address: "3C:FD:FE:A4:9E:48"
+        vlan: native
+      - name: 'nic4'
+        speed: 10gb
+        features: 'dpdk|sriov'
+        address: 10.10.183.23/24
+        mac_address: "3C:FD:FE:A4:9E:49"
+        vlan: native
+      - name: 'nic5'
+        speed: 10gb
+        features: 'dpdk|sriov'
+        address: 10.10.184.23/24
+        mac_address: "3C:FD:FE:A4:9E:4A"
+        vlan: native
+      - name: 'nic6'
+        speed: 10gb
+        features: 'dpdk|sriov'
+        address: 10.10.185.23/24
+        mac_address: "3C:FD:FE:A4:9E:4B"
+        vlan: native
+  - name: pod18-node4
+    node: *nodeparas
+    disks: *disks
+    remote_management:
+      <<: *remoteparas
+      address: 10.10.180.14/24
+      mac_address: "A4:BF:01:14:72:0F"
+    interfaces:
+      - name: 'nic1'
+        speed: 1gb
+        features:
+        address: 10.10.180.24/24
+        mac_address: "A4:BF:01:14:72:0D"
+        vlan: native
+      - name: 'nic2'
+        speed: 1gb
+        features:
+        address: 10.10.181.24/24
+        mac_address: "A4:BF:01:14:72:0E"
+        vlan: native
+      - name: 'nic3'
+        speed: 10gb
+        features: 'dpdk|sriov'
+        address: 10.10.182.24/24
+        mac_address: "3C:FD:FE:A4:9D:E8"
+        vlan: native
+      - name: 'nic4'
+        speed: 10gb
+        features: 'dpdk|sriov'
+        address: 10.10.183.24/24
+        mac_address: "3C:FD:FE:A4:9D:E9"
+        vlan: native
+      - name: 'nic5'
+        speed: 10gb
+        features: 'dpdk|sriov'
+        address: 10.10.184.24/24
+        mac_address: "3C:FD:FE:A4:9D:EA"
+        vlan: native
+      - name: 'nic6'
+        speed: 10gb
+        features: 'dpdk|sriov'
+        address: 10.10.185.24/24
+        mac_address: "3C:FD:FE:A4:9D:EB"
+        vlan: native
+  - name: pod18-node5
+    node: *nodeparas
+    disks: *disks
+    remote_management:
+      <<: *remoteparas
+      address: 10.10.180.15/24
+      mac_address: "A4:BF:01:14:71:70"
+    interfaces:
+      - name: 'nic1'
+        speed: 1gb
+        features:
+        address: 10.10.180.25/24
+        mac_address: "A4:BF:01:14:71:68"
+        vlan: native
+      - name: 'nic2'
+        speed: 1gb
+        features:
+        address: 10.10.181.25/24
+        mac_address: "A4:BF:01:14:71:69"
+        vlan: native
+      - name: 'nic3'
+        speed: 10gb
+        features: 'dpdk|sriov'
+        address: 10.10.182.25/24
+        mac_address: "3C:FD:FE:A4:A1:08"
+        vlan: native
+      - name: 'nic4'
+        speed: 10gb
+        features: 'dpdk|sriov'
+        address: 10.10.183.25/24
+        mac_address: "3C:FD:FE:A4:A1:09"
+        vlan: native
+      - name: 'nic5'
+        speed: 10gb
+        features: 'dpdk|sriov'
+        address: 10.10.184.25/24
+        mac_address: "3C:FD:FE:A4:A1:0A"
+        vlan: native
+      - name: 'nic6'
+        speed: 10gb
+        features: 'dpdk|sriov'
+        address: 10.10.185.25/24
+        mac_address: "3C:FD:FE:A4:A1:0B"
+        vlan: native
diff --git a/labs/zte/idf-pod1.yaml b/labs/zte/idf-pod1.yaml
new file mode 100644 (file)
index 0000000..42e5dda
--- /dev/null
@@ -0,0 +1,44 @@
+##############################################################################
+# Copyright (c) 2017 ZTE, Mirantis Inc., Enea AB 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
+##############################################################################
+---
+### ZTE POD 1 installer descriptor file ###
+
+idf:
+  version: 0.1
+  fuel:
+    jumphost:
+      bridges:
+        admin: 'pxebr'
+        mgmt: 'br-mgmt'
+        private: ''
+        public: 'br-external'
+    network:
+      node:
+        # Ordered-list, index should be in sync with node index in PDF
+        - interfaces: &interfaces
+            # Ordered-list, index should be in sync with interface index in PDF
+            - 'ens4f0'
+            - 'ens12f0'
+            - 'ens12f1'
+            - 'ens44f0'
+            - 'ens44f1'
+          busaddr: &busaddr
+            # Bus-info reported by `ethtool -i ethX`
+            - '0000:01:00.0'
+            - '0000:08:00.0'
+            - '0000:08:00.1'
+            - '0000:81:00.0'
+            - '0000:81:00.1'
+        - interfaces: *interfaces
+          busaddr: *busaddr
+        - interfaces: *interfaces
+          busaddr: *busaddr
+        - interfaces: *interfaces
+          busaddr: *busaddr
+        - interfaces: *interfaces
+          busaddr: *busaddr
diff --git a/labs/zte/idf-pod2.yaml b/labs/zte/idf-pod2.yaml
new file mode 100644 (file)
index 0000000..e8d7f78
--- /dev/null
@@ -0,0 +1,41 @@
+##############################################################################
+# Copyright (c) 2017 ZTE, Mirantis Inc., Enea AB 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
+##############################################################################
+---
+### ZTE POD 2 installer descriptor file ###
+
+idf:
+  version: 0.1
+  daisy:
+    jumphost:
+      bridges:
+        admin: 'br7'
+    network:
+      node:
+        # Ordered-list, index should be in sync with node index in PDF
+        - interfaces: &interfaces
+            # Ordered-list, index should be in sync with interface index in PDF
+            - 'ens4f0'
+            - 'ens12f0'
+            - 'ens12f1'
+            - 'ens44f0'
+            - 'ens44f1'
+          busaddr: &busaddr
+            # Bus-info reported by `ethtool -i ethX`
+            - '0000:01:00.0'
+            - '0000:08:00.0'
+            - '0000:08:00.1'
+            - '0000:81:00.0'
+            - '0000:81:00.1'
+        - interfaces: *interfaces
+          busaddr: *busaddr
+        - interfaces: *interfaces
+          busaddr: *busaddr
+        - interfaces: *interfaces
+          busaddr: *busaddr
+        - interfaces: *interfaces
+          busaddr: *busaddr
diff --git a/labs/zte/idf-pod3.yaml b/labs/zte/idf-pod3.yaml
new file mode 100644 (file)
index 0000000..d1bb156
--- /dev/null
@@ -0,0 +1,39 @@
+##############################################################################
+# Copyright (c) 2017 ZTE, Mirantis Inc., Enea AB 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
+##############################################################################
+---
+### ZTE POD 3 installer descriptor file ###
+
+idf:
+  version: 0.1
+  daisy:
+    jumphost:
+      bridges:
+        admin: 'br0'
+    network:
+      node:
+        # Ordered-list, index should be in sync with node index in PDF
+        - interfaces: &interfaces
+            # Ordered-list, index should be in sync with interface index in PDF
+            - 'enp2s0f0'
+            - 'enp2s0f1'
+            - 'enp132s0f0'
+            - 'enp132s0f1'
+          busaddr: &busaddr
+            # Bus-info reported by `ethtool -i ethX`
+            - '0000:02:00.0'
+            - '0000:02:00.1'
+            - '0000:84:00.0'
+            - '0000:84:00.1'
+        - interfaces: *interfaces
+          busaddr: *busaddr
+        - interfaces: *interfaces
+          busaddr: *busaddr
+        - interfaces: *interfaces
+          busaddr: *busaddr
+        - interfaces: *interfaces
+          busaddr: *busaddr
diff --git a/labs/zte/pod1.yaml b/labs/zte/pod1.yaml
new file mode 100644 (file)
index 0000000..bdc5ab4
--- /dev/null
@@ -0,0 +1,244 @@
+---
+### ZTE POD 1 descriptor file ###
+# refering to https://gerrit.opnfv.org/gerrit/#/c/23727/9/config/pod1.yaml
+
+details:
+  pod_owner: Alex Yang
+  contact: yangyang1@zte.com.cn
+  lab: ZTE Pharos Lab
+  location: Shanghai, China
+  type: production
+  link: https://wiki.opnfv.org/display/pharos/ZTE+SH+Testlab
+##############################################################################
+net_config:
+  # NOTE: Network names are likely to change after the PDF spec is updated
+  oob:
+    interface: 0
+    ip-range: 192.168.1.101-192.168.1.105
+    vlan: null
+  admin:
+    interface: 0
+    vlan: native
+    network: 10.20.6.0
+    mask: 24
+  mgmt:
+    interface: 1
+    vlan: 161
+    network: 192.168.61.0
+    mask: 24
+  storage:
+    interface: 2
+    vlan: 162
+    network: 192.168.62.0
+    mask: 24
+  private:
+    interface: 3
+    vlan: 1120
+    network: 192.168.63.0
+    mask: 24
+  public:
+    interface: 4
+    vlan: 163
+    network: 172.60.0.0
+    mask: 24
+    gateway: 172.60.0.1
+    dns:
+      - 172.10.0.1
+##############################################################################
+jumphost:
+  name: pod1-jump
+  node:
+    type: baremetal
+    vendor: ZTE
+    model: R5300
+    arch: x86_64
+    cpus: 2
+    cpu_cflags: hasewell
+    cores: 12
+    memory: 128G
+  disks:
+    - name: 'disk1'
+      disk_capacity: 600G
+      disk_type: hdd
+      disk_interface: sas
+      disk_rotation: 10000
+    - name: 'disk2'
+      disk_capacity: 600G
+      disk_type: hdd
+      disk_interface: sas
+      disk_rotation: 10000
+    - name: 'disk3'
+      disk_capacity: 600G
+      disk_type: hdd
+      disk_interface: sas
+      disk_rotation: 10000
+  os: CentOS-7
+  remote_params: &remote_params
+    type: ipmi
+    versions:
+      - 2.0
+    user: >
+      ENC[PKCS7,MIIBeQYJKoZIhvcNAQcDoIIBajCCAWYCAQAxggEhMIIBHQIBADAFMAACAQEw
+      DQYJKoZIhvcNAQEBBQAEggEAV6BaFHBOwnf4GkZaHcoBjUi97U+68ossDNM1
+      fRRvw+whiNZ/UMkEheasAW2/sP//W+B8cIMLrFpA6vqYpn5wzFSWOsnXRDOW
+      hz1746p600c9TjsGbpMPtbNGgi68t3nB8VQoW7e57bM+yWVvJzLSI2my8bEw
+      a6FNuICymRAeXeyZjXSJ7w71F1XA8stuDSXm4/kAvigNTmS4kdvm6NYSNSZ9
+      +DtNJjcVQtXBpzNIB8sf+y9yTt1d58ZaSBtCLBIRoG+vSpFzJjUyPOdv01rP
+      pMleQ7IJHrucl8p35/pQ2nUOErrSBwNLq+XMIusIRySW1gAbxFn/I+d1aYsK
+      Txv0nDA8BgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBAq1Y9d1AWsRxLIGNXE
+      1zJGgBCXqWtf5xcL5n9/YtpHtmA0]
+    pass: >
+      ENC[PKCS7,MIIBeQYJKoZIhvcNAQcDoIIBajCCAWYCAQAxggEhMIIBHQIBADAFMAACAQEw
+      DQYJKoZIhvcNAQEBBQAEggEAhnPH8p1YJQDJ3wS/0+KZemgS4oTX2gNKMJsf
+      TDmJzQNAcGnuORSEoowdTGUq65QFlb3yUi5B7mHaer2mN/4v12rEKc7TYRfB
+      PBNzpudCwB1UtMJTDBjrKtpVv4iWclAKZmreV4VKCFAFWHeQEzQhBQGBoykk
+      UKRdNCKcuBhoNa5d9QEjgpTse5PtEgPZxPQsKFh4RDQJRpL+JUHw05Cs8rv0
+      PR6UAnvrbd/pcYnUZUkNZc9x7bfedG6274A88DQ6sGFAbLjH2YvnJrNbUvy5
+      Le7bUT5G1V1ymtVpxg30ECDaSX4zKMeFgcHdU+dPAqSHfCkD1wLI7Cn5o7j2
+      uZZORTA8BgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBAGF9iDD5dBZN8p2qbS
+      4IoqgBAYdFlBw90sTOBqrhoHmRbr]
+  remote_management:
+    <<: *remote_params
+    address:
+    mac_address:
+  interfaces:
+    - mac_address: "74:4a:a4:00:91:b3"
+      speed: 1gb
+  fixed_ips:
+    admin: 10.20.6.1
+    mgmt: 192.168.61.238
+    public: 172.60.0.238
+nodes:
+  - name: pod1-node1
+    node: &nodeparas
+      type: baremetal
+      vendor: ZTE
+      model: E9000
+      arch: x86_64
+      cpus: 2
+      cpu_cflags: hasewell
+      cores: 10
+      memory: 128G
+    disks: &disks
+      - name: 'disk1'
+        disk_capacity: 600G
+        disk_type: hdd
+        disk_interface: sas
+        disk_rotation: 10000
+      - name: 'disk2'
+        disk_capacity: 600G
+        disk_type: hdd
+        disk_interface: sas
+        disk_rotation: 10000
+    remote_management:
+      <<: *remote_params
+      address: 192.168.1.101
+      mac_address: "74:4a:a4:00:cf:d9"
+    interfaces:
+      - mac_address: "74:4a:a4:00:cf:dc"
+        speed: 1gb
+        features: null
+      - mac_address: "74:4a:a4:00:b0:e1"
+        speed: 10gb
+        features: dpdk|sriov
+      - mac_address: "74:4a:a4:00:b0:e2"
+        speed: 10gb
+        features: dpdk|sriov
+      - mac_address: "74:4a:a4:00:b0:dd"
+        speed: 10gb
+        features: dpdk|sriov
+      - mac_address: "74:4a:a4:00:b0:de"
+        speed: 10gb
+        features: dpdk|sriov
+  - name: pod1-node2
+    node: *nodeparas
+    disks: *disks
+    remote_management:
+      <<: *remote_params
+      address: 192.168.1.102
+      mac_address: "74:4a:a4:00:ce:cb"
+    interfaces:
+      - mac_address: "74:4a:a4:00:ce:ce"
+        speed: 1gb
+        features: null
+      - mac_address: "74:4a:a4:00:d6:ad"
+        speed: 10gb
+        features: dpdk|sriov
+      - mac_address: "74:4a:a4:00:d6:ae"
+        speed: 10gb
+        features: dpdk|sriov
+      - mac_address: "74:4a:a4:00:d6:a9"
+        speed: 10gb
+        features: dpdk|sriov
+      - mac_address: "74:4a:a4:00:d6:aa"
+        speed: 10gb
+        features: dpdk|sriov
+  - name: pod1-node3
+    node: *nodeparas
+    disks: *disks
+    remote_management:
+      <<: *remote_params
+      address: 192.168.1.103
+      mac_address: "74:4a:a4:00:cf:55"
+    interfaces:
+      - mac_address: "74:4a:a4:00:cf:58"
+        speed: 1gb
+        features: null
+      - mac_address: "74:4a:a4:00:d6:ab"
+        speed: 10gb
+        features: dpdk|sriov
+      - mac_address: "74:4a:a4:00:d6:ac"
+        speed: 10gb
+        features: dpdk|sriov
+      - mac_address: "74:4a:a4:00:d6:af"
+        speed: 10gb
+        features: dpdk|sriov
+      - mac_address: "74:4a:a4:00:d6:b0"
+        speed: 10gb
+        features: dpdk|sriov
+  - name: pod1-node4
+    node: *nodeparas
+    disks: *disks
+    remote_management:
+      <<: *remote_params
+      address: 192.168.1.104
+      mac_address: "74:4a:a4:00:49:81"
+    interfaces:
+      - mac_address: "74:4a:a4:00:49:84"
+        speed: 1gb
+        features: null
+      - mac_address: "74:4a:a4:00:b1:a5"
+        speed: 10gb
+        features: dpdk|sriov
+      - mac_address: "74:4a:a4:00:b1:a6"
+        speed: 10gb
+        features: dpdk|sriov
+      - mac_address: "74:4a:a4:00:b1:b1"
+        speed: 10gb
+        features: dpdk|sriov
+      - mac_address: "74:4a:a4:00:b1:b2"
+        speed: 10gb
+        features: dpdk|sriov
+  - name: pod1-node5
+    node: *nodeparas
+    disks: *disks
+    remote_management:
+      <<: *remote_params
+      address: 192.168.1.105
+      mac_address: "74:4a:a4:00:ce:bf"
+    interfaces:
+      - mac_address: "74:4a:a4:00:ce:c2"
+        speed: 1gb
+        features: null
+      - mac_address: "74:4a:a4:00:d6:8d"
+        speed: 10gb
+        features: dpdk|sriov
+      - mac_address: "74:4a:a4:00:d6:8e"
+        speed: 10gb
+        features: dpdk|sriov
+      - mac_address: "74:4a:a4:00:d6:9b"
+        speed: 10gb
+        features: dpdk|sriov
+      - mac_address: "74:4a:a4:00:d6:9c"
+        speed: 10gb
+        features: dpdk|sriov
diff --git a/labs/zte/pod2.yaml b/labs/zte/pod2.yaml
new file mode 100644 (file)
index 0000000..9cf629f
--- /dev/null
@@ -0,0 +1,244 @@
+---
+### ZTE POD 2 descriptor file ###
+# refering to https://gerrit.opnfv.org/gerrit/#/c/23727/9/config/pod1.yaml
+
+details:
+  pod_owner: Alex Yang
+  contact: yangyang1@zte.com.cn
+  lab: ZTE Pharos Lab
+  location: Shanghai, China
+  type: production
+  link: https://wiki.opnfv.org/display/pharos/ZTE+SH+Testlab
+##############################################################################
+net_config:
+  # NOTE: Network names are likely to change after the PDF spec is updated
+  oob:
+    interface: 0
+    ip-range: 192.168.1.106-192.168.1.110
+    vlan: null
+  admin:
+    interface: 0
+    vlan: native
+    network: 10.20.7.0
+    mask: 24
+  mgmt:
+    interface: 1
+    vlan: 171
+    network: 192.168.71.0
+    mask: 24
+  storage:
+    interface: 2
+    vlan: 172
+    network: 192.168.72.0
+    mask: 24
+  private:
+    interface: 3
+    vlan: 1170
+    network: 192.168.73.0
+    mask: 24
+  public:
+    interface: 4
+    vlan: 173
+    network: 172.70.0.0
+    mask: 24
+    gateway: 172.70.0.1
+    dns:
+      - 172.10.0.1
+##############################################################################
+jumphost:
+  name: pod2-jump
+  node:
+    type: baremetal
+    vendor: ZTE
+    model: R5300
+    arch: x86_64
+    cpus: 2
+    cpu_cflags: hasewell
+    cores: 12
+    memory: 128G
+  disks:
+    - name: 'disk1'
+      disk_capacity: 600G
+      disk_type: hdd
+      disk_interface: sas
+      disk_rotation: 10500
+    - name: 'disk2'
+      disk_capacity: 4000G
+      disk_type: hdd
+      disk_interface: sata
+      disk_rotation: 7200
+    - name: 'disk3'
+      disk_capacity: 4000G
+      disk_type: hdd
+      disk_interface: sata
+      disk_rotation: 7200
+
+  os: CentOS-7
+  remote_params: &remote_params
+    type: ipmi
+    versions:
+      - 2.0
+    user: >
+      ENC[PKCS7,MIIBeQYJKoZIhvcNAQcDoIIBajCCAWYCAQAxggEhMIIBHQIBADAFMAACAQEw
+      DQYJKoZIhvcNAQEBBQAEggEAjGsowRz086iBgT7GNCXRBJiDP2wnTz8LBbT3
+      /P0pVQd06kLmnkQmTi49VNWeEHRrrt5PtNzthESzs5YLPugzPn7m2WMvrY62
+      0d3upsHXOc4B+pSYELiExSsnLheowpKyo6/HJfmqqemsKKbfEf6d6oCWJyfC
+      SI8lGbAFntjjg1rN19IEg9tSEndLSmnFsJfPKxJ4VoZHAQJXXtPSGiod7qPV
+      a0VoVXTSxdaUHVKe4QBnVRnxySxETc3ODPaSZ/glVCha/p+bAueRNFrLikCY
+      /7Ize90GeZwUTAdIabT1kalGOqDU43zdPDae2bYdqi7/MfhftIo0iUfL/KYs
+      DmpuADA8BgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBB3doQ87dzhGnTj6eDW
+      xD3DgBC1WpkH6osu52WpkWz035Yt]
+    pass: >
+      ENC[PKCS7,MIIBeQYJKoZIhvcNAQcDoIIBajCCAWYCAQAxggEhMIIBHQIBADAFMAACAQEw
+      DQYJKoZIhvcNAQEBBQAEggEAS6Xz1p73hApGo78ebuKNaGh2Vx0jSg5rkqcA
+      tGpR1ManuGedDFeZSuDmXAghZ3DoHEG0E9s/XfNlxJr7hn9XXGh4ZL9sfxdK
+      NXXXjyv0u7KB7xjju5/wgR7vfpVYl81rcatlOYFH+k/1V2BdZOA4Z4u0ew0L
+      yPA4jkXBVH8FcWvvLReunXsq0LDHeVSUxvFpRZrDVuhmgYtPnsnmrce1CkG9
+      Ro2WInZ05nyP+d75KoYIRzhXsQH2kUCXVuDUzEZh7+Iu4g5nTaBZkInwyFHg
+      FrNTuK33zL0/oXJepNiZMTcUHAgQauyIeZaRld87IibpcykxLeCnpYe/GQCA
+      SkmKXzA8BgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBBBtn/v3HNPTNYCvP1e
+      2+PxgBC5OzeXar0HSyATMD/Z7K0x]
+  remote_management:
+    <<: *remote_params
+    address:
+    mac_address:
+  interfaces:
+    - mac_address: "74:4a:a4:00:91:18"
+      speed: 1gb
+  fixed_ips:
+    admin: 10.20.7.1
+    public: 172.70.0.239
+nodes:
+  - name: pod2-node1
+    node: &nodeparas
+      type: baremetal
+      vendor: ZTE
+      model: E9000
+      arch: x86_64
+      cpus: 2
+      cpu_cflags: hasewell
+      cores: 10
+      memory: 128G
+    disks: &disks
+      - name: 'disk1'
+        disk_capacity: 600G
+        disk_type: hdd
+        disk_interface: sas
+        disk_rotation: 10000
+      - name: 'disk2'
+        disk_capacity: 600G
+        disk_type: hdd
+        disk_interface: sas
+        disk_rotation: 10000
+    remote_management:
+      <<: *remote_params
+      address: 192.168.1.106
+      mac_address: "74:4a:a4:00:cd:6f"
+    interfaces:
+      - mac_address: "74:4a:a4:00:cd:72"
+        speed: 1gb
+        features: null
+      - mac_address: "74:4a:a4:00:b0:e9"
+        speed: 10gb
+        features: dpdk|sriov
+      - mac_address: "74:4a:a4:00:b0:ea"
+        speed: 10gb
+        features: dpdk|sriov
+      - mac_address: "74:4a:a4:00:b0:eb"
+        speed: 10gb
+        features: dpdk|sriov
+      - mac_address: "74:4a:a4:00:b0:ec"
+        speed: 10gb
+        features: dpdk|sriov
+  - name: pod2-node2
+    node: *nodeparas
+    disks: *disks
+    remote_management:
+      <<: *remote_params
+      address: 192.168.1.107
+      mac_address: "74:4a:a4:00:ca:c9"
+    interfaces:
+      - mac_address: "74:4a:a4:00:ca:cc"
+        speed: 1gb
+        features: null
+      - mac_address: "74:4a:a4:00:d6:a3"
+        speed: 10gb
+        features: dpdk|sriov
+      - mac_address: "74:4a:a4:00:d6:a4"
+        speed: 10gb
+        features: dpdk|sriov
+      - mac_address: "74:4a:a4:00:d6:99"
+        speed: 10gb
+        features: dpdk|sriov
+      - mac_address: "74:4a:a4:00:d6:9a"
+        speed: 10gb
+        features: dpdk|sriov
+  - name: pod2-node3
+    node: *nodeparas
+    disks: *disks
+    remote_management:
+      <<: *remote_params
+      address: 192.168.1.108
+      mac_address: "74:4a:a4:00:cd:0f"
+    interfaces:
+      - mac_address: "74:4a:a4:00:cd:12"
+        speed: 1gb
+        features: null
+      - mac_address: "74:4a:a4:00:d6:9d"
+        speed: 10gb
+        features: dpdk|sriov
+      - mac_address: "74:4a:a4:00:d6:9e"
+        speed: 10gb
+        features: dpdk|sriov
+      - mac_address: "74:4a:a4:00:d3:15"
+        speed: 10gb
+        features: dpdk|sriov
+      - mac_address: "74:4a:a4:00:d3:16"
+        speed: 10gb
+        features: dpdk|sriov
+  - name: pod2-node4
+    node: *nodeparas
+    disks: *disks
+    remote_management:
+      <<: *remote_params
+      address: 192.168.1.109
+      mac_address: "74:4a:a4:00:cf:3d"
+    interfaces:
+      - mac_address: "74:4a:a4:00:cf:40"
+        speed: 1gb
+        features: null
+      - mac_address: "74:4a:a4:00:d6:a5"
+        speed: 10gb
+        features: dpdk|sriov
+      - mac_address: "74:4a:a4:00:d6:a6"
+        speed: 10gb
+        features: dpdk|sriov
+      - mac_address: "74:4a:a4:00:d6:a7"
+        speed: 10gb
+        features: dpdk|sriov
+      - mac_address: "74:4a:a4:00:d6:a8"
+        speed: 10gb
+        features: dpdk|sriov
+  - name: pod2-node5
+    node: *nodeparas
+    disks: *disks
+    remote_management:
+      <<: *remote_params
+      address: 192.168.1.110
+      mac_address: "74:4a:a4:00:ce:d1"
+    interfaces:
+      - mac_address: "74:4a:a4:00:ce:d4"
+        speed: 1gb
+        features: null
+      - mac_address: "74:4a:a4:00:d2:c3"
+        speed: 10gb
+        features: dpdk|sriov
+      - mac_address: "74:4a:a4:00:d2:c4"
+        speed: 10gb
+        features: dpdk|sriov
+      - mac_address: "74:4a:a4:00:d2:c1"
+        speed: 10gb
+        features: dpdk|sriov
+      - mac_address: "74:4a:a4:00:d2:c2"
+        speed: 10gb
+        features: dpdk|sriov
diff --git a/labs/zte/pod2/daisy/config/deploy.yml b/labs/zte/pod2/daisy/config/deploy.yml
new file mode 100644 (file)
index 0000000..5b74dad
--- /dev/null
@@ -0,0 +1,78 @@
+##############################################################################
+# 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:
+    ipmi_pass:
+    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:
+    ipmi_pass:
+    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:
+    ipmi_pass:
+    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:
+    ipmi_pass:
+    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:
+    ipmi_pass:
+    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: ''
+daisy_ip: '10.20.7.3'
+daisy_gateway: '10.20.7.1'
+ceph_disk_name: '/dev/sdb'
diff --git a/labs/zte/pod2/daisy/config/network.yml b/labs/zte/pod2/daisy/config/network.yml
new file mode 100644 (file)
index 0000000..739d1a4
--- /dev/null
@@ -0,0 +1,85 @@
+##############################################################################
+# 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: '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.2'
+        'end': '192.168.71.254'
+    vlan_id: 171
+    name: 'MANAGEMENT'
+  - cidr: '192.168.72.0/24'
+    gateway: '192.168.72.1'
+    ip_ranges:
+      - 'start': '192.168.72.2'
+        'end': '192.168.72.254'
+    vlan_id: 172
+    name: 'STORAGE'
+  - cidr: '172.70.0.0/24'
+    gateway: '172.70.0.1'
+    ip_ranges:
+      - 'start': '172.70.0.2'
+        'end': '172.70.0.100'
+    vlan_id: 173
+    'name': 'EXTERNAL'
+    network_name: 'admin_external'
+    mapping: 'physnet1'
+  - cidr: '192.168.71.0/24'
+    gateway: '192.168.71.1'
+    ip_ranges:
+      - 'start': '192.168.71.2'
+        'end': '192.168.71.254'
+    vlan_id: 171
+    name: 'PUBLICAPI'
+  - cidr: '192.168.73.0/24'
+    gateway: '192.168.73.1'
+    ip_ranges:
+      - 'start': '192.168.73.2'
+        'end': '192.168.73.254'
+    vlan_id: 1130
+    name: 'TENANT'
+  - cidr: '10.20.7.0/24'
+    gateway: '10.20.7.1'
+    ip_ranges:
+      - 'start': '10.20.7.20'
+        'end': '10.20.7.200'
+    vlan_id: null
+    name: 'HEARTBEAT'
+interfaces:
+  - name: 'EXTERNAL'
+    interface: 'ens44f1'
+  - name: 'MANAGEMENT'
+    interface: 'ens12f0'
+  - name: 'PUBLICAPI'
+    interface: 'ens12f0'
+  - name: 'STORAGE'
+    interface: 'ens12f1'
+  - name: 'TENANT'
+    interface: 'ens44f0'
+  - name: 'HEARTBEAT'
+    interface: 'ens4f0'
+internal_vip: '192.168.71.10'
+public_vip: '10.20.7.11'
diff --git a/labs/zte/pod3.yaml b/labs/zte/pod3.yaml
new file mode 100644 (file)
index 0000000..d930d52
--- /dev/null
@@ -0,0 +1,228 @@
+---
+### ZTE POD 3 descriptor file ###
+# refering to https://gerrit.opnfv.org/gerrit/#/c/23727/9/config/pod1.yaml
+
+details:
+  pod_owner: Alex Yang
+  contact: yangyang1@zte.com.cn
+  lab: ZTE Pharos Lab
+  location: Shanghai, China
+  type: production
+  link: https://wiki.opnfv.org/display/pharos/ZTE+SH+Testlab
+##############################################################################
+net_config:
+  # NOTE: Network names are likely to change after the PDF spec is updated
+  oob:
+    interface: 0
+    ip-range: 192.168.1.32-192.168.1.36
+    vlan: null
+  admin:
+    interface: 0
+    vlan: native
+    network: 10.20.0.0
+    mask: 24
+  mgmt:
+    interface: 1
+    vlan: 101
+    network: 192.168.11.0
+    mask: 24
+  storage:
+    interface: 2
+    vlan: 102
+    network: 192.168.12.0
+    mask: 24
+  private:
+    interface: 3
+    vlan: 1030
+    network: 192.168.13.0
+    mask: 24
+  public:
+    interface: 3
+    vlan: 103
+    network: 172.10.0.0
+    mask: 24
+    gateway: 172.10.0.1
+    dns:
+      - 172.10.0.1
+##############################################################################
+jumphost:
+  name: pod3-jump
+  node:
+    type: baremetal
+    vendor: ZTE
+    model: R5300
+    arch: x86_64
+    cpus: 1
+    cpu_cflags: hasewell
+    cores: 6
+    memory: 80G
+  disks:
+    - name: 'disk1'
+      disk_capacity: 300G
+      disk_type: hdd
+      disk_interface: sas
+      disk_rotation: 10000
+    - name: 'disk2'
+      disk_capacity: 300G
+      disk_type: hdd
+      disk_interface: sas
+      disk_rotation: 10000
+    - name: 'disk3'
+      disk_capacity: 1200G
+      disk_type: hdd
+      disk_interface: iscsi
+      disk_rotation: 10000
+  os: CentOS-7
+  remote_params: &remote_params
+    type: ipmi
+    versions:
+      - 2.0
+    user: >
+      ENC[PKCS7,MIIBeQYJKoZIhvcNAQcDoIIBajCCAWYCAQAxggEhMIIBHQIBADAFMAACAQEw
+      DQYJKoZIhvcNAQEBBQAEggEADgVg8o88krQcS+2MfYJL+9zQ3rY2FV7vDSWf
+      /1ddIvlD8FkCZ9z33o6o8lwKcAJqc9spWrZAEIZtifIeNgdVo0ju2I2aYDN6
+      itK+RAg4LItCFvnfJD3UMwh0JfjGBI1AsTCT/GB3MdGOgBCcOQnguyCHLhFL
+      tnVmmoZCOdjGpuInTcEQJPU5jVZLo1cVsX+wAnU+jqmoVMBXDtliv9kbkqoz
+      jdNJEeMxe9q9neTM23vXWEtWOdOLYPBox6xSN9hyYri3IRHHrIhb4DMILQx6
+      ZS7/lSgbnUBaGx8K4SiEz99Wsll8Tim8KX79BEIVJhpqLmmFmPlGKZwGUi06
+      d8NY6zA8BgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBBIaNintvK/akCPueun
+      WuV4gBDZrP04W2rq3w4SokOEnPRs]
+    pass: >
+      ENC[PKCS7,MIIBeQYJKoZIhvcNAQcDoIIBajCCAWYCAQAxggEhMIIBHQIBADAFMAACAQEw
+      DQYJKoZIhvcNAQEBBQAEggEAWq1q+u3W7VcZQ2/yAFGMsjuNIo8OTX8JQgxT
+      pEoijuuLCLZ7pRwjd+pAESQZiPBqDf+CbYDpyjiyAm7GkKwk4vtrNY4JLvSZ
+      L2ci58ZqL2eOh2a4pLvi/s+gd1qaPk3aIzpCQc/Js3jfpeL4RCDmwjJc5WmE
+      aGmEv/UDD/WqMjztGPVyU/QNXl5lDaRZmC2vywJGYEJDnQDZWn9inKtErMpr
+      a7lvq0sRIb4okxH7Wd0yl3SgjpGN5+wVAYUSRoqbX/TaDkQVt32HY3cI5ni/
+      mraT38QkjsB9n435ottOArJ6g7Z5Q0V5NPtiQe6zKGMHwenzEXPNT/HjvoEA
+      D1j48jA8BgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBCeXP53GSCSDveAhe6x
+      ZIpvgBCa0QYVwRsEcqVofk2pmPKq]
+  remote_management:
+    <<: *remote_params
+    address:
+    mac_address:
+  interfaces:
+    - mac_address: "74:4a:a4:00:21:0c"
+      speed: 1gb
+  fixed_ips:
+    admin: 10.20.0.1
+    public: 172.10.0.240
+nodes:
+  - name: pod3-node1
+    node: &nodeparas
+      type: baremetal
+      vendor: ZTE
+      model: E9000
+      arch: x86_64
+      cpus: 2
+      cpu_cflags: ivybridge
+      cores: 10
+      memory: 64G
+    disks: &disks
+      - name: 'disk1'
+        disk_capacity: 600G
+        disk_type: hdd
+        disk_interface: sas
+        disk_rotation: 10000
+      - name: 'disk2'
+        disk_capacity: 600G
+        disk_type: hdd
+        disk_interface: sas
+        disk_rotation: 10000
+    remote_management:
+      <<: *remote_params
+      address: 192.168.1.32
+      mac_address: "0c:12:62:e4:bf:de"
+    interfaces:
+      - mac_address: "74:4a:a4:00:0b:85"
+        speed: 10gb
+        features: dpdk|sriov
+      - mac_address: "74:4a:a4:00:0b:86"
+        speed: 10gb
+        features: dpdk|sriov
+      - mac_address: "74:4a:a4:00:0b:87"
+        speed: 10gb
+        features: dpdk|sriov
+      - mac_address: "74:4a:a4:00:0b:88"
+        speed: 10gb
+        features: dpdk|sriov
+  - name: pod3-node2
+    node: *nodeparas
+    disks: *disks
+    remote_management:
+      <<: *remote_params
+      address: 192.168.1.33
+      mac_address: "00:12:62:e4:c0:33"
+    interfaces:
+      - mac_address: "74:4a:a4:00:5c:5d"
+        speed: 10gb
+        features: dpdk|sriov
+      - mac_address: "74:4a:a4:00:5c:5e"
+        speed: 10gb
+        features: dpdk|sriov
+      - mac_address: "74:4a:a4:00:5c:5f"
+        speed: 10gb
+        features: dpdk|sriov
+      - mac_address: "74:4a:a4:00:5c:60"
+        speed: 10gb
+        features: dpdk|sriov
+  - name: pod3-node3
+    node: *nodeparas
+    disks: *disks
+    remote_management:
+      <<: *remote_params
+      address: 192.168.1.34
+      mac_address: "74:4a:a4:00:30:93"
+    interfaces:
+      - mac_address: "74:4a:a4:00:5c:35"
+        speed: 10gb
+        features: dpdk|sriov
+      - mac_address: "74:4a:a4:00:5c:36"
+        speed: 10gb
+        features: dpdk|sriov
+      - mac_address: "74:4a:a4:00:5c:37"
+        speed: 10gb
+        features: dpdk|sriov
+      - mac_address: "74:4a:a4:00:5c:38"
+        speed: 10gb
+        features: dpdk|sriov
+  - name: pod3-node4
+    node: *nodeparas
+    disks: *disks
+    remote_management:
+      <<: *remote_params
+      address: 192.168.1.35
+      mac_address: "00:12:62:e4:c0:42"
+    interfaces:
+      - mac_address: "74:4a:a4:00:5c:69"
+        speed: 10gb
+        features: dpdk|sriov
+      - mac_address: "74:4a:a4:00:5c:6a"
+        speed: 10gb
+        features: dpdk|sriov
+      - mac_address: "74:4a:a4:00:5c:6b"
+        speed: 10gb
+        features: dpdk|sriov
+      - mac_address: "74:4a:a4:00:5c:6c"
+        speed: 10gb
+        features: dpdk|sriov
+  - name: pod3-node5
+    node: *nodeparas
+    disks: *disks
+    remote_management:
+      <<: *remote_params
+      address: 192.168.1.36
+      mac_address: "74:4a:a4:00:30:43"
+    interfaces:
+      - mac_address: "74:4a:a4:00:5c:6d"
+        speed: 10gb
+        features: dpdk|sriov
+      - mac_address: "74:4a:a4:00:5c:6e"
+        speed: 10gb
+        features: dpdk|sriov
+      - mac_address: "74:4a:a4:00:5c:6f"
+        speed: 10gb
+        features: dpdk|sriov
+      - mac_address: "74:4a:a4:00:5c:70"
+        speed: 10gb
+        features: dpdk|sriov
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..55c1b07
--- /dev/null
@@ -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:
+    ipmi_pass:
+    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:
+    ipmi_pass:
+    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:
+    ipmi_pass:
+    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:
+    ipmi_pass:
+    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:
+    ipmi_pass:
+    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: ''
+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..b2d6696
--- /dev/null
@@ -0,0 +1,85 @@
+##############################################################################
+# 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'
diff --git a/labs/zte/virtual1/daisy/config/deploy.yml b/labs/zte/virtual1/daisy/config/deploy.yml
new file mode 100644 (file)
index 0000000..49db19e
--- /dev/null
@@ -0,0 +1,32 @@
+---
+adapter: libvirt
+hosts:
+  - name: 'controller01'
+    roles:
+      - 'CONTROLLER_LB'
+    template: 'templates/virtual_environment/vms/controller.xml'
+  - name: 'controller02'
+    roles:
+      - 'CONTROLLER_LB'
+    template: 'templates/virtual_environment/vms/controller.xml'
+  - name: 'controller03'
+    roles:
+      - 'CONTROLLER_LB'
+    template: 'templates/virtual_environment/vms/controller.xml'
+  - name: 'computer01'
+    roles:
+      - 'COMPUTER'
+    template: 'templates/virtual_environment/vms/computer.xml'
+  - name: 'computer02'
+    roles:
+      - 'COMPUTER'
+    template: 'templates/virtual_environment/vms/computer.xml'
+disks:
+  daisy: 50
+  controller: 110
+  compute: 110
+  ceph: 110
+daisy_passwd: ''
+daisy_ip: '10.20.11.2'
+daisy_gateway: '10.20.11.1'
+ceph_disk_name: '/dev/sdb'
diff --git a/labs/zte/virtual1/daisy/config/network.yml b/labs/zte/virtual1/daisy/config/network.yml
new file mode 100644 (file)
index 0000000..35b49fe
--- /dev/null
@@ -0,0 +1,69 @@
+##############################################################################
+# 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-virtual1 network config'
+  version: '0.1'
+  created: 'Tue Apr 11 2017'
+  comment: 'five vm node deploy'
+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.1'
+    ip_ranges:
+      - start: '172.10.101.2'
+        end: '172.10.101.20'
+    name: 'EXTERNAL'
+    network_name: 'admin_external'
+    mapping: 'physnet1'
+  - 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'
+  - cidr: '100.20.11.0/24'
+    gateway: '100.20.11.1'
+    ip_ranges:
+      - start: '100.20.11.3'
+        end: '100.20.11.10'
+    name: 'HEARTBEAT'
+interfaces:
+  - name: 'EXTERNAL'
+    interface: 'ens8'
+  - name: 'MANAGEMENT'
+    interface: 'ens3'
+  - name: 'PUBLICAPI'
+    interface: 'ens3'
+  - name: 'STORAGE'
+    interface: 'ens3'
+  - name: 'TENANT'
+    interface: 'ens3'
+  - name: 'HEARTBEAT'
+    interface: 'ens9'
+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 (file)
index 0000000..1f25e02
--- /dev/null
@@ -0,0 +1,16 @@
+---
+adapter: libvirt
+hosts:
+  - name: 'all_in_one'
+    roles:
+      - 'CONTROLLER_LB'
+      - 'COMPUTER'
+    template: 'templates/virtual_environment/vms/all_in_one.xml'
+disks:
+  daisy: 50
+  controller: 110
+  compute: 110
+daisy_passwd: ''
+daisy_ip: '10.20.11.2'
+daisy_gateway: '10.20.11.1'
+ceph_disk_name: ''
diff --git a/labs/zte/virtual2/daisy/config/network.yml b/labs/zte/virtual2/daisy/config/network.yml
new file mode 100644 (file)
index 0000000..d27fd03
--- /dev/null
@@ -0,0 +1,69 @@
+##############################################################################
+# 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-virtual2 network config'
+  version: '0.1'
+  created: 'Tue Apr 11 2017'
+  comment: 'all-in-one vm node deploy'
+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.1'
+    ip_ranges:
+      - start: '172.10.101.2'
+        end: '172.10.101.20'
+    name: 'EXTERNAL'
+    network_name: 'admin_external'
+    mapping: 'physnet1'
+  - 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'
+  - cidr: '100.20.11.0/24'
+    gateway: '100.20.11.1'
+    ip_ranges:
+      - start: '100.20.11.3'
+        end: '100.20.11.10'
+    name: 'HEARTBEAT'
+interfaces:
+  - name: 'EXTERNAL'
+    interface: 'ens8'
+  - name: 'MANAGEMENT'
+    interface: 'ens3'
+  - name: 'PUBLICAPI'
+    interface: 'ens3'
+  - name: 'STORAGE'
+    interface: 'ens3'
+  - name: 'TENANT'
+    interface: 'ens3'
+  - name: 'HEARTBEAT'
+    interface: 'ens9'
+internal_vip: '10.20.11.11'
+public_vip: '10.20.11.11'