From 96ba14e8648807eb340d978ba0d301a09c878752 Mon Sep 17 00:00:00 2001 From: Zhijiang Hu Date: Fri, 12 Jan 2018 23:11:51 -0500 Subject: Align example config files to pharos format After [1], get_mac_addresses_for_virtual()'s behavior was changed. So in order to let it to produce right mac_addresses for both pharos's and example's config file, the example config files' format should also be changed accordingly. [1] https://gerrit.opnfv.org/gerrit/#/c/50325/ Change-Id: Ia1ee481057fbe87ab8410c0354c4724bcf013ac4 Signed-off-by: Zhijiang Hu --- .../bm_environment/zte-baremetal1/deploy.yml | 60 +++++++++++----------- .../config/vm_environment/zte-virtual1/deploy.yml | 40 +++++++-------- .../config/vm_environment/zte-virtual2/deploy.yml | 12 ++--- 3 files changed, 56 insertions(+), 56 deletions(-) diff --git a/deploy/config/bm_environment/zte-baremetal1/deploy.yml b/deploy/config/bm_environment/zte-baremetal1/deploy.yml index 0c147280..620dd5f4 100644 --- a/deploy/config/bm_environment/zte-baremetal1/deploy.yml +++ b/deploy/config/bm_environment/zte-baremetal1/deploy.yml @@ -1,35 +1,35 @@ adapter: 'ipmi' hosts: -- name: 'controller01' - roles: - - 'CONTROLLER_LB' - ipmi_ip: '192.168.1.106' - ipmi_user: 'testuser' - ipmi_pass: 'testpass' -- name: 'controller02' - roles: - - 'CONTROLLER_LB' - ipmi_ip: '192.168.1.107' - ipmi_user: 'testuser' - ipmi_pass: 'testpass' -- name: 'controller03' - roles: - - 'CONTROLLER_LB' - ipmi_ip: '192.168.1.108' - ipmi_user: 'testuser' - ipmi_pass: 'testpass' -- name: 'computer01' - roles: - - 'COMPUTER' - ipmi_ip: '192.168.1.109' - ipmi_user: 'testuser' - ipmi_pass: 'testpass' -- name: 'computer02' - roles: - - 'COMPUTER' - ipmi_ip: '192.168.1.110' - ipmi_user: 'testuser' - ipmi_pass: 'testpass' + - name: 'controller01' + roles: + - 'CONTROLLER_LB' + ipmi_ip: '192.168.1.106' + ipmi_user: 'testuser' + ipmi_pass: 'testpass' + - name: 'controller02' + roles: + - 'CONTROLLER_LB' + ipmi_ip: '192.168.1.107' + ipmi_user: 'testuser' + ipmi_pass: 'testpass' + - name: 'controller03' + roles: + - 'CONTROLLER_LB' + ipmi_ip: '192.168.1.108' + ipmi_user: 'testuser' + ipmi_pass: 'testpass' + - name: 'computer01' + roles: + - 'COMPUTER' + ipmi_ip: '192.168.1.109' + ipmi_user: 'testuser' + ipmi_pass: 'testpass' + - name: 'computer02' + roles: + - 'COMPUTER' + ipmi_ip: '192.168.1.110' + ipmi_user: 'testuser' + ipmi_pass: 'testpass' disks: daisy: 50 daisy_passwd: 'r00tme' diff --git a/deploy/config/vm_environment/zte-virtual1/deploy.yml b/deploy/config/vm_environment/zte-virtual1/deploy.yml index e80d0310..e17214cf 100644 --- a/deploy/config/vm_environment/zte-virtual1/deploy.yml +++ b/deploy/config/vm_environment/zte-virtual1/deploy.yml @@ -1,25 +1,25 @@ 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' + - 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 diff --git a/deploy/config/vm_environment/zte-virtual2/deploy.yml b/deploy/config/vm_environment/zte-virtual2/deploy.yml index d4c99e97..c6c7d238 100644 --- a/deploy/config/vm_environment/zte-virtual2/deploy.yml +++ b/deploy/config/vm_environment/zte-virtual2/deploy.yml @@ -1,10 +1,10 @@ adapter: libvirt hosts: -- name: 'all_in_one' - roles: - - 'CONTROLLER_LB' - - 'COMPUTER' - template: 'templates/virtual_environment/vms/all_in_one.xml' + - name: 'all_in_one' + roles: + - 'CONTROLLER_LB' + - 'COMPUTER' + template: 'templates/virtual_environment/vms/all_in_one.xml' disks: daisy: 50 controller: 110 @@ -12,4 +12,4 @@ disks: daisy_passwd: 'r00tme' daisy_ip: '10.20.11.2' daisy_gateway: '10.20.11.1' -ceph_disk_name: '' \ No newline at end of file +ceph_disk_name: '' -- cgit 1.2.3-korg