summaryrefslogtreecommitdiffstats
path: root/etc
diff options
context:
space:
mode:
Diffstat (limited to 'etc')
-rw-r--r--etc/infra/infra_deploy.yaml.sample34
-rw-r--r--etc/yardstick/nodes/fuel_baremetal/pod.yaml20
-rw-r--r--etc/yardstick/nodes/zte_pod1.yaml50
3 files changed, 44 insertions, 60 deletions
diff --git a/etc/infra/infra_deploy.yaml.sample b/etc/infra/infra_deploy.yaml.sample
new file mode 100644
index 000000000..fb162d35b
--- /dev/null
+++ b/etc/infra/infra_deploy.yaml.sample
@@ -0,0 +1,34 @@
+nodes:
+ - name: Yardstick VM
+ hostname: yardstickvm
+ interfaces:
+ - network: management
+ ip: 192.168.1.10
+ netmask: 255.255.255.0
+ user: ubuntu
+ pasword: password
+ image: /tmp/image1.qcow
+ disk: 50000
+ ram: 8192
+ vcpus: 4
+
+ - name Controller_Compute VM
+ openstack_node: controller_compute
+ hostname: controller_compute
+ interfaces:
+ - network: management
+ ip: 192.168.1.20
+ netmask: 255.255.255.0
+ - network: traffic
+ ip: 192.20.1.20
+ netmask: 255.255.255.0
+ user: ubuntu
+ pasword: password
+ image: /tmp/image_2.qcow
+ disk: 40000
+ ram: 32768
+ vcpus: 4
+
+networks:
+ - name: management
+ host_ip: 192.168.1.1 # not mandatory
diff --git a/etc/yardstick/nodes/fuel_baremetal/pod.yaml b/etc/yardstick/nodes/fuel_baremetal/pod.yaml
index acdb44741..5ce555293 100644
--- a/etc/yardstick/nodes/fuel_baremetal/pod.yaml
+++ b/etc/yardstick/nodes/fuel_baremetal/pod.yaml
@@ -23,29 +23,29 @@ nodes:
name: node1
role: Controller
ip: ip1
- user: root
- key_filename: /root/.ssh/id_rsa
+ user: node_username
+ key_filename: node_keyfile
-
name: node2
role: Controller
ip: ip2
- user: root
- key_filename: /root/.ssh/id_rsa
+ user: node_username
+ key_filename: node_keyfile
-
name: node3
role: Controller
ip: ip3
- user: root
- key_filename: /root/.ssh/id_rsa
+ user: node_username
+ key_filename: node_keyfile
-
name: node4
role: Compute
ip: ip4
- user: root
- key_filename: /root/.ssh/id_rsa
+ user: node_username
+ key_filename: node_keyfile
-
name: node5
role: Compute
ip: ip5
- user: root
- key_filename: /root/.ssh/id_rsa
+ user: node_username
+ key_filename: node_keyfile
diff --git a/etc/yardstick/nodes/zte_pod1.yaml b/etc/yardstick/nodes/zte_pod1.yaml
deleted file mode 100644
index ec6e46460..000000000
--- a/etc/yardstick/nodes/zte_pod1.yaml
+++ /dev/null
@@ -1,50 +0,0 @@
-##############################################################################
-# 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
-##############################################################################
----
-# sample config file about the POD information, including the
-# name/IP/user/ssh key of Bare Metal and Controllers/Computes
-#
-# The options of this config file include:
-# name: the name of this node
-# role: node's role, support role: Master/Controller/Comupte/BareMetal
-# ip: the node's IP address
-# user: the username for login
-# key_filename:the path of the private key file for login
-
-nodes:
--
- name: node1
- role: Controller
- ip: 10.20.0.20
- user: root
- key_filename: /root/.ssh/id_rsa
--
- name: node2
- role: Controller
- ip: 10.20.0.21
- user: root
- key_filename: /root/.ssh/id_rsa
--
- name: node3
- role: Controller
- ip: 10.20.0.22
- user: root
- key_filename: /root/.ssh/id_rsa
--
- name: node4
- role: Compute
- ip: 10.20.0.23
- user: root
- key_filename: /root/.ssh/id_rsa
--
- name: node5
- role: Compute
- ip: 10.20.0.24
- user: root
- key_filename: /root/.ssh/id_rsa