diff options
| author |   zhihui wu <wu.zhihui1@zte.com.cn> | 2018-02-11 07:43:33 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2018-02-11 07:43:33 +0000 |
| commit | e94dbc6b59d41e46be7578c1152506badd56a8c7 (patch) | |
| tree | 1ffb67e05f5fc8383f455a89f0636046d32051d5 /resources/ansible_roles/qtip-generator | |
| parent | 363e601ce9d9b06c1ae4e3e7031c0e98b4151185 (diff) | |
| parent | 936415d85d9d7471d7061b81f5f0d17164c9c795 (diff) | |
Merge "Add the creation/deletion of image in the pipeline"
Diffstat (limited to 'resources/ansible_roles/qtip-generator')
4 files changed, 91 insertions, 0 deletions
diff --git a/resources/ansible_roles/qtip-generator/defaults/main.yml b/resources/ansible_roles/qtip-generator/defaults/main.yml index 344feb54..b7616486 100644 --- a/resources/ansible_roles/qtip-generator/defaults/main.yml +++ b/resources/ansible_roles/qtip-generator/defaults/main.yml @@ -22,3 +22,6 @@ project_template: 'compute' qtip_package: ../../.. qtip_cache: .qtip-cache cwd: . + +# TODO(zhihui) temporarily hardcode +sut_type: vnf
\ No newline at end of file diff --git a/resources/ansible_roles/qtip-generator/files/compute/heat_template.yml b/resources/ansible_roles/qtip-generator/files/compute/heat_template.yml new file mode 100644 index 00000000..d476c8f5 --- /dev/null +++ b/resources/ansible_roles/qtip-generator/files/compute/heat_template.yml @@ -0,0 +1,70 @@ +############################################################################## +# Copyright (c) 2017 ZTE Corporation and others. +# taseer94@gmail.com +# 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 +############################################################################## + +--- + +heat_template_version: 2015-04-30 + +description: Simple template to deploy a single compute instance + +parameters: + image_name: + type: string + label: Image ID + description: Image to be used for compute instance + default: Ubuntu 16.04 x86_64 + flavor_name: + type: string + label: Instance Type + description: Type of instance (flavor) to be used + default: m1.large + net_name: + type: string + label: Test network name + description: The name of the stack's network + default: qtip_net + subnet_name: + type: string + label: Test subnet name + description: The name of the stack's subnet + default: qtip_subnet + instance_name: + type: string + label: Test VM name + description: The name of the spawned vm + default: qtip_vm + +resources: + private_net: + type: OS::Neutron::Net + properties: + name: { get_param: net_name } + + private_subnet: + type: OS::Neutron::Subnet + properties: + name: { get_param: subnet_name } + network_id: { get_resource: private_net } + cidr: 10.0.0.0/24 + + server1_port: + type: OS::Neutron::Port + properties: + network_id: { get_resource: private_net } + fixed_ips: + - subnet_id: { get_resource: private_subnet } + + my_instance: + type: OS::Nova::Server + properties: + name: { get_param: instance_name } + image: { get_param: image_name } + flavor: { get_param: flavor_name } + networks: + - port: { get_resource: server1_port } diff --git a/resources/ansible_roles/qtip-generator/files/compute/setup.yml b/resources/ansible_roles/qtip-generator/files/compute/setup.yml index f5920c1f..d7f2b875 100644 --- a/resources/ansible_roles/qtip-generator/files/compute/setup.yml +++ b/resources/ansible_roles/qtip-generator/files/compute/setup.yml @@ -10,6 +10,14 @@ # Prepare connection to SUT (System Under Test) --- + +{% if sut_type == 'vnf' %} +- hosts: localhost + gather_facts: no + roles: + - { role: openstack, tasks: create_image } +{% endif %} + {% if installer_type == 'manual' %} - hosts: localhost gather_facts: no diff --git a/resources/ansible_roles/qtip-generator/files/compute/teardown.yml b/resources/ansible_roles/qtip-generator/files/compute/teardown.yml index dc659930..84d9c8c1 100644 --- a/resources/ansible_roles/qtip-generator/files/compute/teardown.yml +++ b/resources/ansible_roles/qtip-generator/files/compute/teardown.yml @@ -7,8 +7,18 @@ # http://www.apache.org/licenses/LICENSE-2.0 ############################################################################## +{% if sut_type == 'vnf' %} +- hosts: localhost + gather_facts: no + roles: + - { role: openstack, tasks: delete_image } +{% endif %} + - hosts: SUT roles: # teardown environment - { role: qtip, tasks: teardown } + + + |