diff options
| author |   Zhijiang Hu <hu.zhijiang@zte.com.cn> | 2017-05-25 11:10:14 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-05-25 11:10:14 +0000 |
| commit | 8f3626f39a5e0eb1be7a971dcc2accf5a0b8b569 (patch) | |
| tree | 57275d51ebe6d8d08f6c633ffe7a02fc6a47f83f /deploy/config | |
| parent | 9b3bab184c182f58a5329c1cbb2bd0c4cf3cc66e (diff) | |
| parent | 24e32399eba20d6b613b654b60b1dcc48a857adc (diff) | |
Merge "Use unified vm template files in python deploy script"
Diffstat (limited to 'deploy/config')
| -rw-r--r-- | deploy/config/schemas.py | 3 | ||||
| -rw-r--r-- | deploy/config/vm_environment/zte-virtual1/deploy.yml | 1 | ||||
| -rw-r--r-- | deploy/config/vm_environment/zte-virtual2/deploy.yml | 5 |
3 files changed, 8 insertions, 1 deletions
diff --git a/deploy/config/schemas.py b/deploy/config/schemas.py index 7cc2c80e..d2fd7ef6 100644 --- a/deploy/config/schemas.py +++ b/deploy/config/schemas.py @@ -27,7 +27,8 @@ hosts_schema = { 'type': 'string', 'enum': ['COMPUTER', 'CONTROLLER_LB', 'CONTROLLER_HA'] } - } + }, + 'template': {'type': 'string', 'minLength': 1} } } } diff --git a/deploy/config/vm_environment/zte-virtual1/deploy.yml b/deploy/config/vm_environment/zte-virtual1/deploy.yml index 0b3a2c52..a85f429f 100644 --- a/deploy/config/vm_environment/zte-virtual1/deploy.yml +++ b/deploy/config/vm_environment/zte-virtual1/deploy.yml @@ -4,6 +4,7 @@ hosts: roles:
- 'CONTROLLER_LB'
- 'COMPUTER'
+ template: 'templates/virtual_environment/vms/all_in_one.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 646fa130..43b2ed03 100644 --- a/deploy/config/vm_environment/zte-virtual2/deploy.yml +++ b/deploy/config/vm_environment/zte-virtual2/deploy.yml @@ -3,18 +3,23 @@ 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
|