Skip to content

Commit

Permalink
2.2.1->2.2.2, version repack
Browse files Browse the repository at this point in the history
  • Loading branch information
0lvin committed May 3, 2018
1 parent c94e1b4 commit f1e225f
Show file tree
Hide file tree
Showing 5 changed files with 121 additions and 4 deletions.
2 changes: 2 additions & 0 deletions CHANGELOG.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
2.2.2:
- Fix debug info about selected hosts.
2.2.1:
- Fix handling of VMs currently being cloned (VSPHERE-86)
2.2.0:
Expand Down
4 changes: 2 additions & 2 deletions plugin.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ plugins:
vsphere:
executor: central_deployment_agent
package_name: cloudify-vsphere-plugin
package_version: '2.2.1'
source: https://github.com/cloudify-cosmo/cloudify-vsphere-plugin/archive/2.2.1.zip
package_version: '2.2.2'
source: https://github.com/cloudify-cosmo/cloudify-vsphere-plugin/archive/2.2.2.zip

data_types:
cloudify.datatypes.vsphere.Config:
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
setuptools.setup(
zip_safe=True,
name='cloudify-vsphere-plugin',
version='2.2.1',
version='2.2.2',
packages=[
'vsphere_plugin_common',
'vsphere_plugin_common.vendored_collections',
Expand Down
115 changes: 115 additions & 0 deletions system_tests/resources/linux/snapshot.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,115 @@
tosca_definitions_version: cloudify_dsl_1_3

imports:
- https://raw.githubusercontent.com/cloudify-cosmo/cloudify-vsphere-plugin/2.2.2/plugin.yaml
- http://www.getcloudify.org/spec/cloudify/3.4/types.yaml

inputs:

vcenter_user:
type: string

vcenter_password:
type: string

vcenter_ip:
type: string

vcenter_port:
type: string
default: 443

vcenter_datacenter:
type: string
description: >
vcenter datacenter
default: Datacenter

vcenter_resource_pool:
description: >
Resource pool name
default: Resources

vsphere_auto_placement:
type: string
default: true

template_name:
type: string
description: >
"CentOS 7 template name"
default: "CentOS-7.2-x86_64-1511-tmpl"

vcenter_network:
type: string
description: >
vcenter network
default: Internal

vcenter_datastore:
type: string
description: >
vcenter datastore
default: datastore1

agent_user:
default: root
type: string

agent_group:
default: root

manager_network:
default: default

install_method:
default: remote

allowed_hosts:
default: []

allowed_clusters:
default: []

allowed_datastores:
default: []

###############################################################################
# DSL section
###############################################################################
dsl_definitions:

connection_config: &connection_config
username: { get_input: vcenter_user }
password: {get_input: vcenter_password }
host: { get_input: vcenter_ip }
port: { get_input: vcenter_port }
datacenter_name: {get_input: vcenter_datacenter }
resource_pool_name: { get_input: vcenter_resource_pool }
auto_placement: { get_input: vsphere_auto_placement }
# allow_insecure: true

node_templates:
###############################################################################
# vsphere section
###############################################################################
vm_base:
type: cloudify.vsphere.nodes.Server
properties:
connection_config: *connection_config
os_family: linux
allowed_hosts: { get_input: allowed_hosts }
allowed_clusters: { get_input: allowed_clusters }
allowed_datastores: { get_input: allowed_datastores }
server:
name: other_vm
template: { get_input: template_name }
cpus: 1
memory: 1024
agent_config:
install_method: none
networking:
dns_servers:
- '8.8.8.8'
connect_networks:
- name: Internal
2 changes: 1 addition & 1 deletion vsphere_plugin_common/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -1365,7 +1365,7 @@ def find_candidate_hosts(self,
hosts = [host for host in hosts if host.name in allowed_hosts]
ctx.logger.debug(
'Filtered list of hosts to be considered: {hosts}'.format(
hosts=', '.join(host_names),
hosts=', '.join([host.name for host in hosts]),
)
)

Expand Down

0 comments on commit f1e225f

Please sign in to comment.