Merge branch 'devel' into devel_switch_v2

CHANGELOG.md

@@ -30,6 +30,7 @@ New Modules:
   * cloudstack: cs_instance
   * cloudstack: cs_instancegroup
   * cloudstack: cs_portforward
+  * cloudstack: cs_project
   * cloudstack: cs_sshkeypair
   * cloudstack: cs_securitygroup
   * cloudstack: cs_securitygroup_rule

docsite/rst/guide_aws.rst

@@ -13,7 +13,7 @@ Requirements for the AWS modules are minimal.
 
 All of the modules require and are tested against recent versions of boto.  You'll need this Python module installed on your control machine.  Boto can be installed from your OS distribution or python's "pip install boto".
 
-Whereas classically ansible will execute tasks in it's host loop against multiple remote machines, most cloud-control steps occur on your local machine with reference to the regions to control.
+Whereas classically ansible will execute tasks in its host loop against multiple remote machines, most cloud-control steps occur on your local machine with reference to the regions to control.
 
 In your playbook steps we'll typically be using the following pattern for provisioning steps::
 
@@ -214,7 +214,7 @@ AWS Image Building With Ansible
 ```````````````````````````````
 
 Many users may want to have images boot to a more complete configuration rather than configuring them entirely after instantiation.  To do this,
-one of many programs can be used with Ansible playbooks to define and upload a base image, which will then get it's own AMI ID for usage with
+one of many programs can be used with Ansible playbooks to define and upload a base image, which will then get its own AMI ID for usage with
 the ec2 module or other Ansible AWS modules such as ec2_asg or the cloudformation module.   Possible tools include Packer, aminator, and Ansible's
 ec2_ami module.  
 

lib/ansible/module_utils/f5.py

@@ -0,0 +1,64 @@
+# This code is part of Ansible, but is an independent component.
+# This particular file snippet, and this file snippet only, is BSD licensed.
+# Modules you write using this snippet, which is embedded dynamically by Ansible
+# still belong to the author of the module, and may assign their own license
+# to the complete work.
+#
+# Copyright (c), Etienne Carrière <etienne.carriere@gmail.com>,2015
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification,
+# are permitted provided that the following conditions are met:
+#
+#    * Redistributions of source code must retain the above copyright
+#      notice, this list of conditions and the following disclaimer.
+#    * Redistributions in binary form must reproduce the above copyright notice,
+#      this list of conditions and the following disclaimer in the documentation
+#      and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+# IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
+# USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+try:
+    import bigsuds
+except ImportError:
+    bigsuds_found = False
+else:
+    bigsuds_found = True
+
+
+def f5_argument_spec():
+    return dict(
+        server=dict(type='str', required=True),
+        user=dict(type='str', required=True),
+        password=dict(type='str', aliases=['pass', 'pwd'], required=True, no_log=True),
+        validate_certs = dict(default='yes', type='bool'),
+        state = dict(type='str', default='present', choices=['present', 'absent']),
+        partition = dict(type='str', default='Common')
+    )
+
+
+def f5_parse_arguments(module):
+    if not bigsuds_found:
+        module.fail_json(msg="the python bigsuds module is required")
+    if not module.params['validate_certs']:
+        disable_ssl_cert_validation()
+    return (module.params['server'],module.params['user'],module.params['password'],module.params['state'],module.params['partition'])
+
+def bigip_api(bigip, user, password):
+    api = bigsuds.BIGIP(hostname=bigip, username=user, password=password)
+    return api
+
+def disable_ssl_cert_validation():
+    # You probably only want to do this for testing and never in production.
+    # From https://www.python.org/dev/peps/pep-0476/#id29
+    import ssl
+    ssl._create_default_https_context = ssl._create_unverified_context
+

lib/ansible/module_utils/facts.py

@@ -423,7 +423,7 @@ class Facts(object):
                                 release = re.search("PRETTY_NAME=[^(]+ \(?([^)]+?)\)", data)
                                 if release:
                                     self.facts['distribution_release'] = release.groups()[0]
-                                break
+                                    break
                         elif name == 'Mandriva':
                             data = get_file_content(path)
                             if 'Mandriva' in data:

test/integration/roles/prepare_win_tests/meta/main.yml

@@ -0,0 +1,3 @@
+---
+
+allow_duplicates: yes

test/integration/roles/test_get_url/tasks/main.yml

@@ -26,7 +26,7 @@
     - result.changed 
     - '"OK" in result.msg'
 
-- name: test https fetch to a site with invalid domain
+- name: test https fetch to a site with mismatched hostname and certificate
   get_url:
     url: "https://kennethreitz.org/"
     dest: "{{ output_dir }}/shouldnotexist.html"
@@ -37,11 +37,26 @@
     path: "{{ output_dir }}/shouldnotexist.html"
   register: stat_result
 
-- debug: var=result
-
 - name: Assert that the file was not downloaded
   assert:
     that:
       - "result.failed == true"
       - "'Certificate does not belong to ' in result.msg"
       - "stat_result.stat.exists == false"
+
+- name: test https fetch to a site with mismatched hostname and certificate and validate_certs=no
+  get_url:
+    url: "https://kennethreitz.org/"
+    dest: "{{ output_dir }}/kreitz.html"
+    validate_certs: no
+  register: result
+
+- stat:
+    path: "{{ output_dir }}/kreitz.html"
+  register: stat_result
+
+- name: Assert that the file was downloaded
+  assert:
+    that:
+      - "result.changed == true"
+      - "stat_result.stat.exists == true"

test/integration/roles/test_uri/tasks/main.yml

@@ -91,3 +91,38 @@
   with_together:
     - fail_checksum.results
     - fail.results
+
+- name: test https fetch to a site with mismatched hostname and certificate
+  uri:
+    url: "https://kennethreitz.org/"
+    dest: "{{ output_dir }}/shouldnotexist.html"
+  ignore_errors: True
+  register: result
+
+- stat:
+    path: "{{ output_dir }}/shouldnotexist.html"
+  register: stat_result
+
+- name: Assert that the file was not downloaded
+  assert:
+    that:
+      - "result.failed == true"
+      - "'certificate does not match ' in result.msg"
+      - "stat_result.stat.exists == false"
+
+- name: test https fetch to a site with mismatched hostname and certificate and validate_certs=no
+  get_url:
+    url: "https://kennethreitz.org/"
+    dest: "{{ output_dir }}/kreitz.html"
+    validate_certs: no
+  register: result
+
+- stat:
+    path: "{{ output_dir }}/kreitz.html"
+  register: stat_result
+
+- name: Assert that the file was downloaded
+  assert:
+    that:
+      - "result.changed == true"
+      - "stat_result.stat.exists == true"

test/integration/test_winrm.yml

@@ -18,6 +18,7 @@
 
 - hosts: windows
   gather_facts: false
+  max_fail_percentage: 1
   roles: 
     - { role: test_win_raw, tags: test_win_raw }
     - { role: test_win_script, tags: test_win_script }