diff options
| author |   Zhijiang Hu <hu.zhijiang@zte.com.cn> | 2016-12-20 07:29:16 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2016-12-20 07:29:16 +0000 |
| commit | d5df56b8ef5d5967e471db482d09fac36afc449a (patch) | |
| tree | ffda79a1f00c54ef81f854b38037f18cec4d5dc9 /deploy/config | |
| parent | 3dce9ea92689ace8b88c3996b28adc09d3ab8197 (diff) | |
| parent | 0b57e3be28f1b42d7cea436feb04fbcdf83e8484 (diff) | |
Merge "implement deploy on virthal pod"
Diffstat (limited to 'deploy/config')
| -rw-r--r-- | deploy/config/vm_environment/zte-virtual1/deploy.yml | 26 | ||||
| -rw-r--r-- | deploy/config/vm_environment/zte-virtual1/network.yml | 59 |
2 files changed, 42 insertions, 43 deletions
diff --git a/deploy/config/vm_environment/zte-virtual1/deploy.yml b/deploy/config/vm_environment/zte-virtual1/deploy.yml index e12a981e..78c32014 100644 --- a/deploy/config/vm_environment/zte-virtual1/deploy.yml +++ b/deploy/config/vm_environment/zte-virtual1/deploy.yml @@ -1,22 +1,12 @@ hosts: -- name: 'Node5' +- name: 'all_in_one' roles: - 'CONTROLLER_LB' - 'COMPUTER' - ip: '192.168.122.152' - password: 'ossdbg1' - interface: - - phynic: 'ens3' - logic: - - name: 'MANAGEMENT' - ip: '192.168.122.152' - - name: 'PUBLICAPI' - ip: - - name: 'physnet1' - ip: - - name: 'STORAGE' - ip: - - phynic: 'ens8' - logic: - - name: 'EXTERNAL' - ip: +disks: + daisy: 100G + controller: 100G + compute: 100G +daisy_passwd: 'r00tme' +daisy_ip: '10.20.11.2' +daisy_gateway: '10.20.11.1' diff --git a/deploy/config/vm_environment/zte-virtual1/network.yml b/deploy/config/vm_environment/zte-virtual1/network.yml index ea08117d..36863882 100644 --- a/deploy/config/vm_environment/zte-virtual1/network.yml +++ b/deploy/config/vm_environment/zte-virtual1/network.yml @@ -14,37 +14,46 @@ network-config-metadata: created: 'Mon Oct 31 2016' comment: networks: - - cidr: '192.168.122.0/24' - gateway: '192.168.122.1' + - cidr: '10.20.11.0/24' + gateway: '10.20.11.1' ip_ranges: - - 'start': '192.168.122.1' - 'end': '192.168.122.254' + - 'start': '10.20.11.3' + 'end': '10.20.11.10' name: 'MANAGEMENT' - - cidr: '192.168.122.0/24' - gateway: '192.168.122.1' + - cidr: '10.20.11.0/24' + gateway: '10.20.11.1' ip_ranges: - - start: '192.168.122.1' - end: '192.168.122.254' + - start: '10.20.11.3' + end: '10.20.11.10' name: 'STORAGE' - - cidr: '192.168.2.0/24' - gateway: '192.168.2.1' + - cidr: '172.10.101.0/24' + gateway: '172.10.101.0' ip_ranges: - - 'start': '192.168.2.1' - 'end': '192.168.2.254' + - 'start': '172.10.101.1' + 'end': '172.10.101.10' 'name': 'EXTERNAL' - - cidr: '192.168.122.0/24' - gateway: '192.168.122.1' + - cidr: '10.20.11.0/24' + gateway: '10.20.11.1' ip_ranges: - - 'start': '192.168.122.1' - 'end': '192.168.122.254' + - 'start': '10.20.11.3' + 'end': '10.20.11.10' name: 'PUBLICAPI' - - cidr: '192.168.122.0/24' - gateway: '192.168.122.1' + - cidr: '10.20.11.0/24' + gateway: '10.20.11.1' ip_ranges: - - 'start': '192.168.122.1' - 'end': '192.168.122.254' - name: 'physnet1' - -internal_vip: '192.168.122.144' - -public_vip: '192.168.122.144' + - 'start': '10.20.11.3' + 'end': '10.20.11.10' + name: 'TENANT' +interfaces: + - name: 'EXTERNAL' + interface: 'ens8' + - name: 'MANAGEMENT' + interface: 'ens3' + - name: 'PUBLICAPI' + interface: 'ens3' + - name: 'STORAGE' + interface: 'ens3' + - name: 'TENANT' + interface: 'ens3' +internal_vip: '10.20.11.11' +public_vip: '10.20.11.11' |