Cy 1532 ansible enchantments

CHANGELOG.txt

@@ -27,3 +27,6 @@
   - Add `resumable` support to operations
   - Support `ansible_ssh_pass` in `agent_config`.
   - Fix support for `cfy local`.
+2.5.0:
+  - Update Ansible Version to use 2.8.x
+  - Update Ansible examples

examples/another-relationships-blueprint.yaml

@@ -2,13 +2,13 @@ tosca_definitions_version: cloudify_dsl_1_3
 
 imports:
   - http://www.getcloudify.org/spec/cloudify/4.5/types.yaml
-  - plugin.yaml
+  - plugin:cloudify-ansible-plugin
 
 inputs:
 
   site_yaml_relative_path:
     type: string
-    default: examples/ansible-examples/lamp_simple/site.yml
+    default: ansible-examples/lamp_simple/site.yml
 
   webserver_vm_ip:
     type: string

examples/clearwater-blueprint.yaml

@@ -2,13 +2,13 @@ tosca_definitions_version: cloudify_dsl_1_3
 
 imports:
   - http://www.getcloudify.org/spec/cloudify/4.5/types.yaml
-  - plugin.yaml
+  - plugin:cloudify-ansible-plugin
 
 inputs:
 
   site_yaml_relative_path:
     type: string
-    default: examples/clearwater-roles/site.yml
+    default: clearwater-roles/site.yml
 
   username:
     type: string

examples/compute-blueprint.yaml

@@ -2,13 +2,13 @@ tosca_definitions_version: cloudify_dsl_1_3
 
 imports:
   - http://www.getcloudify.org/spec/cloudify/4.5/types.yaml
-  - plugin.yaml
+  - plugin:cloudify-ansible-plugin
 
 inputs:
 
   site_yaml_relative_path:
     type: string
-    default: examples/ansible-examples/lamp_simple/site.yml
+    default: ansible-examples/lamp_simple/site.yml
 
   webserver_vm_ip:
     type: string
@@ -23,6 +23,11 @@ inputs:
 
   db_private_key:
     type: string
+    default: { get_input: web_private_key }
+
+  username:
+    type: string
+    default: centos
 
 node_templates:
 
@@ -39,15 +44,15 @@ node_templates:
                 hosts:
                   web:
                     ansible_host: { get_property: [ webserver_vm, ip ] }
-                    ansible_user: vagrant
+                    ansible_user: { get_input: username }
                     ansible_ssh_private_key_file: { get_property: [ webserver_vm, agent_config, key ] }
                     ansible_become: True
                     ansible_ssh_common_args: -o StrictHostKeyChecking=no
               dbservers:
                 hosts:
                   db:
                     ansible_host: { get_property: [ dbserver_vm, ip ] }
-                    ansible_user: vagrant
+                    ansible_user: { get_input: username }
                     ansible_ssh_private_key_file: { get_property: [ dbserver_vm, agent_config, key ] }
                     ansible_become: True
                     ansible_ssh_common_args: -o StrictHostKeyChecking=no
@@ -64,6 +69,7 @@ node_templates:
       agent_config:
         install_method: none
         key: { get_input: web_private_key }
+        user: { get_input: username }
 
   dbserver_vm:
     type: cloudify.nodes.Compute
@@ -72,3 +78,4 @@ node_templates:
       agent_config:
         install_method: none
         key: { get_input: db_private_key }
+        user: { get_input: username }

examples/hosts-input-blueprint.yaml

@@ -2,17 +2,17 @@ tosca_definitions_version: cloudify_dsl_1_3
 
 imports:
   - http://www.getcloudify.org/spec/cloudify/4.5/types.yaml
-  - plugin.yaml
+  - plugin:cloudify-ansible-plugin
 
 inputs:
 
   site_yaml_relative_path:
     type: string
-    default: examples/ansible-examples/lamp_simple/site.yml
+    default: ansible-examples/lamp_simple/site.yml
 
   hosts_relative_path:
     type: string
-    default: examples/ansible-examples/lamp_simple/hosts
+    default: ansible-examples/lamp_simple/hosts
 
 node_templates:
 

examples/local-blueprint.yaml

@@ -2,13 +2,13 @@ tosca_definitions_version: cloudify_dsl_1_3
 
 imports:
   - http://www.getcloudify.org/spec/cloudify/4.5/types.yaml
-  - plugin.yaml
+  - plugin:cloudify-ansible-plugin
 
 inputs:
 
   site_yaml_relative_path:
     type: string
-    default: examples/local/play.yaml
+    default: local/play.yaml
 
   ssh_server_host:
     type: string

examples/openstack-lamp.yaml

@@ -16,6 +16,7 @@ dsl_definitions:
 imports:
   - http://www.getcloudify.org/spec/cloudify/4.5.5/types.yaml
   - plugin:cloudify-openstack-plugin
+  - https://raw.githubusercontent.com/cloudify-cosmo/cloudify-openstack-plugin/master/compat.yaml
   - plugin:cloudify-ansible-plugin
   - plugin:cloudify-utilities-plugin
 

examples/openvpn-blueprint.yaml

@@ -2,13 +2,13 @@ tosca_definitions_version: cloudify_dsl_1_3
 
 imports:
   - http://www.getcloudify.org/spec/cloudify/4.5/types.yaml
-  - plugin.yaml
+  - plugin:cloudify-ansible-plugin
 
 inputs:
 
   site_yaml_relative_path:
     type: string
-    default: examples/openvpn/openvpn.yml
+    default: openvpn/openvpn.yml
 
   openvpn_server_ip:
     type: string

examples/relationships-blueprint.yaml

@@ -2,13 +2,13 @@ tosca_definitions_version: cloudify_dsl_1_3
 
 imports:
   - http://www.getcloudify.org/spec/cloudify/4.5/types.yaml
-  - plugin.yaml
+  - plugin:cloudify-ansible-plugin
 
 inputs:
 
   site_yaml_relative_path:
     type: string
-    default: examples/ansible-examples/lamp_simple/site.yml
+    default: ansible-examples/lamp_simple/site.yml
 
   webserver_vm_ip:
     type: string

plugin.yaml

@@ -2,9 +2,9 @@ plugins:
 
   ansible:
     executor: central_deployment_agent
-    source: https://github.com/cloudify-cosmo/cloudify-ansible-plugin/archive/2.4.0.zip
+    source: https://github.com/cloudify-cosmo/cloudify-ansible-plugin/archive/2.5.0.zip
     package_name: cloudify-ansible-plugin
-    package_version: '2.4.0'
+    package_version: '2.5.0'
 
 node_types:
 
@@ -84,6 +84,10 @@ node_types:
             remerge_sources:
               default: { get_property: [SELF, remerge_sources] }
             sources:
+              ansible:
+                cloudify_ansible:
+                  tasks:
+                    run:
               default: { get_property: [SELF, sources] }
             run_data:
               default: { get_property: [SELF, run_data] }

setup.py

@@ -18,7 +18,7 @@
 
 setup(
     name='cloudify-ansible-plugin',
-    version='2.4.0',
+    version='2.5.0',
     author='Cloudify Platform LTD',
     author_email='hello@cloudify.co',
     description='Manage Ansible nodes by Cloudify.',
@@ -27,6 +27,6 @@
     zip_safe=False,
     install_requires=[
         "cloudify-common>=4.5.5",
-        "ansible>=2.7.10"
+        "ansible>=2.8.0"
     ]
 )