diff options
Diffstat (limited to 'resources/ansible_roles/qtip-generator')
5 files changed, 83 insertions, 50 deletions
diff --git a/resources/ansible_roles/qtip-generator/defaults/main.yml b/resources/ansible_roles/qtip-generator/defaults/main.yml index b7616486..300dadf0 100644 --- a/resources/ansible_roles/qtip-generator/defaults/main.yml +++ b/resources/ansible_roles/qtip-generator/defaults/main.yml @@ -16,6 +16,10 @@ installer_group: apex: apex-underclouds mcp: salt-master +network_group: + mcp: floating_net + apex: external + project_name: 'qtip-project' project_template: 'compute' diff --git a/resources/ansible_roles/qtip-generator/files/compute/group_vars/all.yml b/resources/ansible_roles/qtip-generator/files/compute/group_vars/all.yml index efb2bdb7..1b34fd69 100644 --- a/resources/ansible_roles/qtip-generator/files/compute/group_vars/all.yml +++ b/resources/ansible_roles/qtip-generator/files/compute/group_vars/all.yml @@ -21,3 +21,7 @@ installer_group: fuel: fuel-masters apex: apex-underclouds mcp: salt-master + +network_group: + mcp: floating_net + apex: external diff --git a/resources/ansible_roles/qtip-generator/files/compute/heat_template.yml b/resources/ansible_roles/qtip-generator/files/compute/heat_template.yml index d476c8f5..cb67e624 100644 --- a/resources/ansible_roles/qtip-generator/files/compute/heat_template.yml +++ b/resources/ansible_roles/qtip-generator/files/compute/heat_template.yml @@ -1,70 +1,101 @@ ############################################################################## -# Copyright (c) 2017 ZTE Corporation and others. -# taseer94@gmail.com +# Copyright (c) 2018 ZTE Corporation and others. +# # 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 +description: > + Used to run VMs for QTIP parameters: - image_name: + image: 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: + description: Name of the image + default: qtip_image + + flavor: type: string - label: Test network name - description: The name of the stack's network - default: qtip_net - subnet_name: + description: Name of flavor + default: qtip_flavor + + keypair: type: string - label: Test subnet name - description: The name of the stack's subnet - default: qtip_subnet - instance_name: + description: Name of keypair + default: QtipKey + + external_network: type: string - label: Test VM name - description: The name of the spawned vm - default: qtip_vm + description: Name of the external network resources: - private_net: + + network: type: OS::Neutron::Net properties: - name: { get_param: net_name } + name: qtip_net - private_subnet: + subnet: type: OS::Neutron::Subnet properties: - name: { get_param: subnet_name } - network_id: { get_resource: private_net } - cidr: 10.0.0.0/24 + name: qtip_subnet + ip_version: 4 + cidr: 192.168.0.0/24 + network: { get_resource: network } + dns_nameservers: [8.8.8.8] + + management_router: + type: OS::Neutron::Router + properties: + name: qtip_router + external_gateway_info: + network: { get_param: external_network } + + management_router_interface: + type: OS::Neutron::RouterInterface + properties: + router: { get_resource: management_router } + subnet: { get_resource: subnet } + + floating_ip: + type: OS::Neutron::FloatingIP + properties: + floating_network: { get_param: external_network } + + floating_ip_association: + type: OS::Nova::FloatingIPAssociation + properties: + floating_ip: { get_resource: floating_ip } + server_id: { get_resource: qtip_instance } - server1_port: - type: OS::Neutron::Port + security_group: + type: OS::Neutron::SecurityGroup properties: - network_id: { get_resource: private_net } - fixed_ips: - - subnet_id: { get_resource: private_subnet } + name: qtip_security_group + rules: + - port_range_min: 22 + port_range_max: 5201 + protocol: tcp + - port_range_min: 22 + port_range_max: 5201 + protocol: udp + - protocol: icmp - my_instance: + qtip_instance: type: OS::Nova::Server + depends_on: [subnet] properties: - name: { get_param: instance_name } - image: { get_param: image_name } - flavor: { get_param: flavor_name } + name: { get_param: "OS::stack_name" } + image: { get_param: image } + flavor: { get_param: flavor } + key_name: { get_param: keypair } + security_groups: [{ get_resource: security_group }] networks: - - port: { get_resource: server1_port } + - network: { get_resource: network } +outputs: + instance_ip: + description: The IP address of the instance + value: { get_attr: [floating_ip, floating_ip_address] } diff --git a/resources/ansible_roles/qtip-generator/files/compute/setup.yml b/resources/ansible_roles/qtip-generator/files/compute/setup.yml index d7f2b875..10537615 100644 --- a/resources/ansible_roles/qtip-generator/files/compute/setup.yml +++ b/resources/ansible_roles/qtip-generator/files/compute/setup.yml @@ -15,7 +15,7 @@ - hosts: localhost gather_facts: no roles: - - { role: openstack, tasks: create_image } + - { role: openstack, external_network: {{ network_group[installer_type] }}, heat_template: heat_template.yml } {% endif %} {% if installer_type == 'manual' %} diff --git a/resources/ansible_roles/qtip-generator/files/compute/teardown.yml b/resources/ansible_roles/qtip-generator/files/compute/teardown.yml index 84d9c8c1..e483d7f6 100644 --- a/resources/ansible_roles/qtip-generator/files/compute/teardown.yml +++ b/resources/ansible_roles/qtip-generator/files/compute/teardown.yml @@ -7,12 +7,6 @@ # 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 |