Merge branch 'master' of /home/nimrod/Documents/Shore/Ansible/example

# Conflicts:
#	defaults/main.yml
#	handlers/main.yml
#	molecule.yml
#	tasks/main.yml
#	tests/playbook.yml
#	vars/main.yml

defaults/main.yml

 ---
-# defaults file for ansible-role-ca-store
+# defaults file for ca-store

handlers/main.yml

 ---
-# handlers file for ansible-role-ca-store
-
+# handlers file for ca-store
 - name: Update CA store
   command: '{{ "/usr/local/sbin/update-ca-certificates" if ansible_os_family == "OpenBSD" else "/usr/sbin/update-ca-certificates" }}'

meta/main.yml

 galaxy_info:
   author: Nimrod Adar
-  description: Install and configure similar CA store mechanism
+  description: Install and configure common CA store mechanism
   company: Shore technologies
   license: MIT
   min_ansible_version: 2.0
@@ -12,5 +12,9 @@ galaxy_info:
   - name: Debian
     versions:
     - jessie
+  - name: Ubuntu
+    versions:
+    - trusty
+    - xenial
   galaxy_tags: []
 dependencies: []

molecule.yml

@@ -19,7 +19,7 @@ vagrant:
   - name: debian
     box: debian/jessie64
   instances:
-  - name: ansible-role-ca-store
+  - name: ca-store
     options:
         append_platform_to_hostname: yes
   raw_config_args:
@@ -30,17 +30,17 @@ vagrant:
 
 docker:
   containers:
-  - name: ansible-role-ca-store-xenial
+  - name: ca-store-xenial
     image: ubuntu
     image_version: xenial
     environment:
         DEBIAN_FRONTEND: noninteractive
-  - name: ansible-role-ca-store-trusty
+  - name: ca-store-trusty
     image: ubuntu
     image_version: trusty
     environment:
         DEBIAN_FRONTEND: noninteractive
-  - name: ansible-role-ca-store-jessie
+  - name: ca-store-jessie
     image: debian
     image_version: jessie
     environment:

tasks/main.yml

 ---
-# tasks file for ansible-role-example
+# tasks file for ca-store
 - name: Assertions
   assert:
     that:

tests/playbook.yml

 ---
-- hosts: ansible-role-ca-store-openbsd
+- hosts: ca-store-openbsd
   gather_facts: false
   roles: [ openbsd_bootstrap ]
 

tests/requirements.yml

 ---
-- src: https://github.com/adarnimrod/ansible-role-openbsd-bootstrap
-  scm: git
-  name: openbsd_bootstrap
-- src: https://github.com/adarnimrod/ansible-role-debian-bootstrap
-  scm: git
-  name: debian_bootstrap
+- role: openbsd-bootstrap
+- role: debian-bootstrap

vars/main.yml

 ---
-# vars file for ansible-role-ca-store
+# vars file for ca-store