diff options
Diffstat (limited to 'deploy')
| -rw-r--r-- | deploy/config/vm_environment/zte-virtual2/deploy.yml | 16 | ||||
| -rw-r--r-- | deploy/prepare.sh | 10 | ||||
| -rw-r--r-- | deploy/prepare/execute.py | 11 | ||||
| -rw-r--r-- | deploy/tempest.py | 1 |
4 files changed, 25 insertions, 13 deletions
diff --git a/deploy/config/vm_environment/zte-virtual2/deploy.yml b/deploy/config/vm_environment/zte-virtual2/deploy.yml index 43b2ed03..0202e684 100644 --- a/deploy/config/vm_environment/zte-virtual2/deploy.yml +++ b/deploy/config/vm_environment/zte-virtual2/deploy.yml @@ -4,14 +4,6 @@ hosts: 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'
@@ -20,6 +12,14 @@ hosts: roles:
- 'COMPUTER'
template: 'templates/virtual_environment/vms/computer.xml'
+- name: 'computer03'
+ roles:
+ - 'COMPUTER'
+ template: 'templates/virtual_environment/vms/computer.xml'
+- name: 'computer04'
+ roles:
+ - 'COMPUTER'
+ template: 'templates/virtual_environment/vms/computer.xml'
disks:
daisy: 50
controller: 110
diff --git a/deploy/prepare.sh b/deploy/prepare.sh index d68a6a44..803d2462 100644 --- a/deploy/prepare.sh +++ b/deploy/prepare.sh @@ -21,7 +21,8 @@ xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx usage: `basename $0` -n network_config_file OPTIONS: - -nw network configuration path, necessary + -n network configuration path, necessary + -b 0 for virtual, 1 for baremetal -h Print this message and exit Description: @@ -35,12 +36,15 @@ EOF NETWORK_CONF='' -while getopts "n:h" OPTION +while getopts "n:b:h" OPTION do case $OPTION in n) NETWORK_CONF=${OPTARG} ;; + b) + IS_BARE=${OPTARG} + ;; h) usage exit 0 @@ -53,4 +57,4 @@ do esac done -python $PYTHONPATH/deploy/prepare/execute.py -nw $NETWORK_CONF +python $PYTHONPATH/deploy/prepare/execute.py -nw $NETWORK_CONF -b $IS_BARE diff --git a/deploy/prepare/execute.py b/deploy/prepare/execute.py index 67c31b1b..2b46119d 100644 --- a/deploy/prepare/execute.py +++ b/deploy/prepare/execute.py @@ -39,7 +39,7 @@ def _config_service(service, subs): @_config_service('nova', ['compute']) -def _set_default_compute(): +def _set_qemu_compute(): return '[libvirt]\n' \ 'virt_type=qemu\n' \ 'cpu_mode=none\n' @@ -65,8 +65,15 @@ def main(): type=str, required=True, help='network configuration file') + parser.add_argument('-b', '--is-baremetal', + type=str, + required=True, + help='0 for virtual, 1 for baremetal') args = parser.parse_args() - _set_default_compute() + + if args.is_baremetal == '0': + _set_qemu_compute() + _set_default_floating_pool(args.network_file) _set_trusts_auth() diff --git a/deploy/tempest.py b/deploy/tempest.py index 148e8ba3..4f75ee77 100644 --- a/deploy/tempest.py +++ b/deploy/tempest.py @@ -82,6 +82,7 @@ def prepare_install(): elif conf['host'] and conf['host'] == 'yes': print("discover host...") discover_host(hosts_name) + time.sleep(10) print("update hosts interface...") hosts_info = get_hosts() cluster_info = get_cluster() |