mirror of
https://github.com/ansible-collections/community.general.git
synced 2024-09-14 20:13:21 +02:00
cs_instance: implement host migration support (#40309)
* cs_instance: implement host migration support * fix build * fail fast on update if user is not admin * improve tests a bit * expunge it * fix typo * disable temporarly verify for host on starting instance.
This commit is contained in:
parent
6443a56069
commit
5dd3aa26ea
6 changed files with 125 additions and 26 deletions
|
@ -56,17 +56,17 @@ options:
|
|||
template:
|
||||
description:
|
||||
- Name, display text or id of the template to be used for creating the new instance.
|
||||
- Required when using C(state=present).
|
||||
- Required when using I(state=present).
|
||||
- Mutually exclusive with C(ISO) option.
|
||||
iso:
|
||||
description:
|
||||
- Name or id of the ISO to be used for creating the new instance.
|
||||
- Required when using C(state=present).
|
||||
- Required when using I(state=present).
|
||||
- Mutually exclusive with C(template) option.
|
||||
template_filter:
|
||||
description:
|
||||
- Name of the filter used to search for the template or iso.
|
||||
- Used for params C(iso) or C(template) on C(state=present).
|
||||
- Used for params C(iso) or C(template) on I(state=present).
|
||||
- The filter C(all) was added in 2.6.
|
||||
default: executable
|
||||
choices: [ all, featured, self, selfexecutable, sharedexecutable, executable, community ]
|
||||
|
@ -75,7 +75,7 @@ options:
|
|||
hypervisor:
|
||||
description:
|
||||
- Name the hypervisor to be used for creating the new instance.
|
||||
- Relevant when using C(state=present), but only considered if not set on ISO/template.
|
||||
- Relevant when using I(state=present), but only considered if not set on ISO/template.
|
||||
- If not set or found on ISO/template, first found hypervisor will be used.
|
||||
choices: [ KVM, VMware, BareMetal, XenServer, LXC, HyperV, UCS, OVM, Simulator ]
|
||||
keyboard:
|
||||
|
@ -94,7 +94,7 @@ options:
|
|||
- IPv6 address for default instance's network.
|
||||
ip_to_networks:
|
||||
description:
|
||||
- "List of mappings in the form {'network': NetworkName, 'ip': 1.2.3.4}"
|
||||
- "List of mappings in the form I({'network': NetworkName, 'ip': 1.2.3.4})"
|
||||
- Mutually exclusive with C(networks) option.
|
||||
aliases: [ ip_to_network ]
|
||||
disk_offering:
|
||||
|
@ -111,6 +111,12 @@ options:
|
|||
description:
|
||||
- List of security groups the instance to be applied to.
|
||||
aliases: [ security_group ]
|
||||
host:
|
||||
description:
|
||||
- Host on which an instance should be deployed or started on.
|
||||
- Only considered when I(state=started) or instance is running.
|
||||
- Requires root admin privileges.
|
||||
version_added: 2.6
|
||||
domain:
|
||||
description:
|
||||
- Domain the instance is related to.
|
||||
|
@ -135,20 +141,22 @@ options:
|
|||
description:
|
||||
- Optional data (ASCII) that can be sent to the instance upon a successful deployment.
|
||||
- The data will be automatically base64 encoded.
|
||||
- Consider switching to HTTP_POST by using C(CLOUDSTACK_METHOD=post) to increase the HTTP_GET size limit of 2KB to 32 KB.
|
||||
- Consider switching to HTTP_POST by using I(CLOUDSTACK_METHOD=post) to increase the HTTP_GET size limit of 2KB to 32 KB.
|
||||
force:
|
||||
description:
|
||||
- Force stop/start the instance if required to apply changes, otherwise a running instance will not be changed.
|
||||
default: false
|
||||
type: bool
|
||||
default: no
|
||||
tags:
|
||||
description:
|
||||
- List of tags. Tags are a list of dictionaries having keys C(key) and C(value).
|
||||
- "If you want to delete all tags, set a empty list e.g. C(tags: [])."
|
||||
- "If you want to delete all tags, set a empty list e.g. I(tags: [])."
|
||||
aliases: [ tag ]
|
||||
poll_async:
|
||||
description:
|
||||
- Poll async jobs until job has finished.
|
||||
default: true
|
||||
type: bool
|
||||
default: yes
|
||||
details:
|
||||
description:
|
||||
- Map to specify custom parameters.
|
||||
|
@ -226,7 +234,7 @@ EXAMPLES = '''
|
|||
delegate_to: localhost
|
||||
|
||||
- name: remove an instance
|
||||
- cs_instance:
|
||||
cs_instance:
|
||||
name: web-vm-1
|
||||
state: absent
|
||||
delegate_to: localhost
|
||||
|
@ -356,6 +364,12 @@ hypervisor:
|
|||
returned: success
|
||||
type: string
|
||||
sample: KVM
|
||||
host:
|
||||
description: Hostname of hypervisor an instance is running on.
|
||||
returned: success and instance is running
|
||||
type: string
|
||||
sample: host-01.example.com
|
||||
version_added: 2.6
|
||||
instance_name:
|
||||
description: Internal name of the instance (ROOT admin only).
|
||||
returned: success
|
||||
|
@ -390,6 +404,7 @@ class AnsibleCloudStackInstance(AnsibleCloudStack):
|
|||
'templatename': 'template',
|
||||
'templatedisplaytext': 'template_display_text',
|
||||
'keypair': 'ssh_key',
|
||||
'hostname': 'host',
|
||||
}
|
||||
self.instance = None
|
||||
self.template = None
|
||||
|
@ -398,7 +413,7 @@ class AnsibleCloudStackInstance(AnsibleCloudStack):
|
|||
def get_service_offering_id(self):
|
||||
service_offering = self.module.params.get('service_offering')
|
||||
|
||||
service_offerings = self.query_api('listServiceOfferings', )
|
||||
service_offerings = self.query_api('listServiceOfferings')
|
||||
if service_offerings:
|
||||
if not service_offering:
|
||||
return service_offerings['serviceoffering'][0]['id']
|
||||
|
@ -408,6 +423,23 @@ class AnsibleCloudStackInstance(AnsibleCloudStack):
|
|||
return s['id']
|
||||
self.fail_json(msg="Service offering '%s' not found" % service_offering)
|
||||
|
||||
def get_host_id(self):
|
||||
host_name = self.module.params.get('host')
|
||||
if not host_name:
|
||||
return None
|
||||
|
||||
args = {
|
||||
'type': 'routing',
|
||||
'zoneid': self.get_zone(key='id'),
|
||||
}
|
||||
hosts = self.query_api('listHosts', **args)
|
||||
if hosts:
|
||||
for h in hosts['host']:
|
||||
if h['name'] == host_name:
|
||||
return h['id']
|
||||
|
||||
self.fail_json(msg="Host '%s' not found" % host_name)
|
||||
|
||||
def get_template_or_iso(self, key=None):
|
||||
template = self.module.params.get('template')
|
||||
iso = self.module.params.get('iso')
|
||||
|
@ -670,6 +702,7 @@ class AnsibleCloudStackInstance(AnsibleCloudStack):
|
|||
args['affinitygroupnames'] = self.module.params.get('affinity_groups')
|
||||
args['details'] = self.get_details()
|
||||
args['securitygroupnames'] = self.module.params.get('security_groups')
|
||||
args['hostid'] = self.get_host_id()
|
||||
|
||||
template_iso = self.get_template_or_iso()
|
||||
if 'hypervisor' not in template_iso:
|
||||
|
@ -717,7 +750,7 @@ class AnsibleCloudStackInstance(AnsibleCloudStack):
|
|||
ssh_key_changed,
|
||||
]
|
||||
|
||||
if True in changed:
|
||||
if any(changed):
|
||||
force = self.module.params.get('force')
|
||||
instance_state = instance['state'].lower()
|
||||
if instance_state == 'stopped' or force:
|
||||
|
@ -760,6 +793,23 @@ class AnsibleCloudStackInstance(AnsibleCloudStack):
|
|||
else:
|
||||
self.module.warn("Changes won't be applied to running instances. " +
|
||||
"Use force=true to allow the instance %s to be stopped/started." % instance['name'])
|
||||
|
||||
# migrate to other host
|
||||
host_changed = all([
|
||||
instance['state'].lower() == 'running',
|
||||
self.module.params.get('host'),
|
||||
self.module.params.get('host') != instance.get('hostname')
|
||||
])
|
||||
if host_changed:
|
||||
self.result['changed'] = True
|
||||
args_host = {
|
||||
'virtualmachineid': instance['id'],
|
||||
'hostid': self.get_host_id(),
|
||||
}
|
||||
if not self.module.check_mode:
|
||||
res = self.query_api('migrateVirtualMachineWithVolume', **args_host)
|
||||
instance = self.poll_job(res, 'virtualmachine')
|
||||
|
||||
return instance
|
||||
|
||||
def recover_instance(self, instance):
|
||||
|
@ -829,7 +879,11 @@ class AnsibleCloudStackInstance(AnsibleCloudStack):
|
|||
if instance['state'].lower() in ['stopped', 'stopping']:
|
||||
self.result['changed'] = True
|
||||
if not self.module.check_mode:
|
||||
instance = self.query_api('startVirtualMachine', id=instance['id'])
|
||||
args = {
|
||||
'id': instance['id'],
|
||||
'hostid': self.get_host_id(),
|
||||
}
|
||||
instance = self.query_api('startVirtualMachine', **args)
|
||||
|
||||
poll_async = self.module.params.get('poll_async')
|
||||
if poll_async:
|
||||
|
@ -919,6 +973,7 @@ def main():
|
|||
root_disk_size=dict(type='int'),
|
||||
keyboard=dict(choices=['de', 'de-ch', 'es', 'fi', 'fr', 'fr-be', 'fr-ch', 'is', 'it', 'jp', 'nl-be', 'no', 'pt', 'uk', 'us']),
|
||||
hypervisor=dict(choices=CS_HYPERVISORS),
|
||||
host=dict(),
|
||||
security_groups=dict(type='list', aliases=['security_group']),
|
||||
affinity_groups=dict(type='list', aliases=['affinity_group']),
|
||||
domain=dict(),
|
||||
|
|
|
@ -3,3 +3,4 @@ cs_resource_prefix: "cs-{{ (ansible_date_time.iso8601_micro | to_uuid).split('-'
|
|||
cs_common_template: CentOS 5.6 (64-bit) no GUI (Simulator)
|
||||
cs_common_service_offering: Small Instance
|
||||
cs_common_zone_adv: Sandbox-simulator-advanced
|
||||
cs_common_zone_basic: Sandbox-simulator-basic
|
||||
|
|
|
@ -1,15 +1,15 @@
|
|||
---
|
||||
- include: setup.yml
|
||||
- include_tasks: setup.yml
|
||||
|
||||
- include: present.yml
|
||||
- include: tags.yml
|
||||
- include: absent.yml
|
||||
- include_tasks: present.yml
|
||||
- include_tasks: tags.yml
|
||||
- include_tasks: absent.yml
|
||||
|
||||
- include: present_display_name.yml
|
||||
- include: absent_display_name.yml
|
||||
- include_tasks: present_display_name.yml
|
||||
- include_tasks: absent_display_name.yml
|
||||
|
||||
- include: sshkeys.yml
|
||||
- include_tasks: sshkeys.yml
|
||||
|
||||
- include: project.yml
|
||||
- include_tasks: project.yml
|
||||
|
||||
- include: cleanup.yml
|
||||
- include_tasks: cleanup.yml
|
||||
|
|
|
@ -1,6 +1,8 @@
|
|||
---
|
||||
- name: setup instance to be absent
|
||||
cs_instance: name={{ cs_resource_prefix }}-vm-{{ instance_number }} state=absent
|
||||
cs_instance:
|
||||
name: "{{ cs_resource_prefix }}-vm-{{ instance_number }}"
|
||||
state: expunged
|
||||
register: instance
|
||||
- name: verify instance to be absent
|
||||
assert:
|
||||
|
@ -83,6 +85,10 @@
|
|||
- instance.ssh_key == "{{ cs_resource_prefix }}-sshkey"
|
||||
- not instance.tags
|
||||
|
||||
- name: gather host facts of running instance
|
||||
cs_instance_facts:
|
||||
name: "{{ cs_resource_prefix }}-vm-{{ instance_number }}"
|
||||
|
||||
- name: test running instance not updated in check mode
|
||||
cs_instance:
|
||||
name: "{{ cs_resource_prefix }}-vm-{{ instance_number }}"
|
||||
|
@ -206,9 +212,28 @@
|
|||
- instance.service_offering == "{{ test_cs_instance_offering_2 }}"
|
||||
- instance.state == "Stopped"
|
||||
|
||||
- name: test starting instance in check mdoe
|
||||
- name: setup zone facts
|
||||
cs_zone_facts:
|
||||
name: "{{ cs_common_zone_basic }}"
|
||||
|
||||
- name: setup find the host name
|
||||
shell: cs listHosts type=routing zoneid="{{ cloudstack_zone.id }}"
|
||||
args:
|
||||
chdir: "{{ playbook_dir }}"
|
||||
register: host
|
||||
|
||||
- name: host convert from json
|
||||
set_fact:
|
||||
host_json: "{{ host.stdout | from_json }}"
|
||||
|
||||
- name: select a host on which the instance is not running on
|
||||
set_fact:
|
||||
host: "{{ host_json | json_query('host[?name!=`' + cloudstack_instance.host + '`] | [0]') }}"
|
||||
|
||||
- name: test starting instance in check mode
|
||||
cs_instance:
|
||||
name: "{{ cs_resource_prefix }}-vm-{{ instance_number }}"
|
||||
host: "{{ host.name }}"
|
||||
state: started
|
||||
register: instance
|
||||
check_mode: true
|
||||
|
@ -220,11 +245,13 @@
|
|||
- instance.name == "{{ cs_resource_prefix }}-vm-{{ instance_number }}"
|
||||
- instance.display_name == "{{ cs_resource_prefix }}-display-{{ instance_number }}"
|
||||
- instance.service_offering == "{{ test_cs_instance_offering_2 }}"
|
||||
- instance.host is not defined
|
||||
- instance.state == "Stopped"
|
||||
|
||||
- name: test starting instance
|
||||
cs_instance:
|
||||
name: "{{ cs_resource_prefix }}-vm-{{ instance_number }}"
|
||||
host: "{{ host.name }}"
|
||||
state: started
|
||||
register: instance
|
||||
- name: verify starting instance
|
||||
|
@ -235,11 +262,14 @@
|
|||
- instance.name == "{{ cs_resource_prefix }}-vm-{{ instance_number }}"
|
||||
- instance.display_name == "{{ cs_resource_prefix }}-display-{{ instance_number }}"
|
||||
- instance.service_offering == "{{ test_cs_instance_offering_2 }}"
|
||||
# TODO: this fails randomly, cloudstack issue?
|
||||
#- instance.host == "{{ host.name }}"
|
||||
- instance.state == "Running"
|
||||
|
||||
- name: test starting instance idempotence
|
||||
cs_instance:
|
||||
name: "{{ cs_resource_prefix }}-vm-{{ instance_number }}"
|
||||
host: "{{ host.name }}"
|
||||
state: started
|
||||
register: instance
|
||||
- name: verify starting instance idempotence
|
||||
|
@ -250,12 +280,19 @@
|
|||
- instance.name == "{{ cs_resource_prefix }}-vm-{{ instance_number }}"
|
||||
- instance.display_name == "{{ cs_resource_prefix }}-display-{{ instance_number }}"
|
||||
- instance.service_offering == "{{ test_cs_instance_offering_2 }}"
|
||||
# TODO: this fails randomly, cloudstack issue?
|
||||
#- instance.host == "{{ host.name }}"
|
||||
- instance.state == "Running"
|
||||
|
||||
- name: select a host on which the instance is not running on
|
||||
set_fact:
|
||||
host: "{{ host_json | json_query('host[?name!=`' + instance.host + '`] | [0]') }}"
|
||||
|
||||
- name: test force update running instance in check mode
|
||||
cs_instance:
|
||||
name: "{{ cs_resource_prefix }}-vm-{{ instance_number }}"
|
||||
service_offering: "{{ test_cs_instance_offering_1 }}"
|
||||
host: "{{ host.name }}"
|
||||
force: true
|
||||
register: instance
|
||||
check_mode: true
|
||||
|
@ -267,12 +304,14 @@
|
|||
- instance.name == "{{ cs_resource_prefix }}-vm-{{ instance_number }}"
|
||||
- instance.display_name == "{{ cs_resource_prefix }}-display-{{ instance_number }}"
|
||||
- instance.service_offering == "{{ test_cs_instance_offering_2 }}"
|
||||
- instance.host != "{{ host.name }}"
|
||||
- instance.state == "Running"
|
||||
|
||||
- name: test force update running instance
|
||||
cs_instance:
|
||||
name: "{{ cs_resource_prefix }}-vm-{{ instance_number }}"
|
||||
service_offering: "{{ test_cs_instance_offering_1 }}"
|
||||
host: "{{ host.name }}"
|
||||
force: true
|
||||
register: instance
|
||||
- name: verify force update running instance
|
||||
|
@ -283,12 +322,14 @@
|
|||
- instance.name == "{{ cs_resource_prefix }}-vm-{{ instance_number }}"
|
||||
- instance.display_name == "{{ cs_resource_prefix }}-display-{{ instance_number }}"
|
||||
- instance.service_offering == "{{ test_cs_instance_offering_1 }}"
|
||||
- instance.host == "{{ host.name }}"
|
||||
- instance.state == "Running"
|
||||
|
||||
- name: test force update running instance idempotence
|
||||
cs_instance:
|
||||
name: "{{ cs_resource_prefix }}-vm-{{ instance_number }}"
|
||||
service_offering: "{{ test_cs_instance_offering_1 }}"
|
||||
host: "{{ host.name }}"
|
||||
force: true
|
||||
register: instance
|
||||
- name: verify force update running instance idempotence
|
||||
|
@ -299,6 +340,7 @@
|
|||
- instance.name == "{{ cs_resource_prefix }}-vm-{{ instance_number }}"
|
||||
- instance.display_name == "{{ cs_resource_prefix }}-display-{{ instance_number }}"
|
||||
- instance.service_offering == "{{ test_cs_instance_offering_1 }}"
|
||||
- instance.host == "{{ host.name }}"
|
||||
- instance.state == "Running"
|
||||
|
||||
- name: test restore instance in check mode
|
||||
|
|
|
@ -1,6 +1,8 @@
|
|||
---
|
||||
- name: setup instance with display_name to be absent
|
||||
cs_instance: display_name={{ cs_resource_prefix }}-vm-{{ instance_number }} state=absent
|
||||
cs_instance:
|
||||
display_name: "{{ cs_resource_prefix }}-vm-{{ instance_number }}"
|
||||
state: expunged
|
||||
register: instance
|
||||
- name: verify instance with display_name to be absent
|
||||
assert:
|
||||
|
|
|
@ -154,7 +154,6 @@ lib/ansible/modules/cloud/cloudscale/cloudscale_server.py E325
|
|||
lib/ansible/modules/cloud/cloudstack/cs_cluster.py E326
|
||||
lib/ansible/modules/cloud/cloudstack/cs_domain.py E325
|
||||
lib/ansible/modules/cloud/cloudstack/cs_host.py E326
|
||||
lib/ansible/modules/cloud/cloudstack/cs_instance.py E325
|
||||
lib/ansible/modules/cloud/cloudstack/cs_instance.py E326
|
||||
lib/ansible/modules/cloud/cloudstack/cs_instance_nic_secondaryip.py E325
|
||||
lib/ansible/modules/cloud/cloudstack/cs_iso.py E323
|
||||
|
|
Loading…
Reference in a new issue