(ansible) Extend ansible supported modules

* openssl_* from crypto-modules category * ini_file, iso_extract, assemble
werf · Mar 7, 2018 · 4f98dc5 · 4f98dc5
1 parent 0a6f7cf
commit 4f98dc5
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 4 deletions.
diff --git a/dappdeps/ansible/omnibus/config/projects/dappdeps-ansible.rb b/dappdeps/ansible/omnibus/config/projects/dappdeps-ansible.rb
@@ -5,7 +5,7 @@
 license "MIT"
 license_file "LICENSE.txt"
 
-DOCKER_IMAGE_VERSION = "2.4.4.0-9"
+DOCKER_IMAGE_VERSION = "2.4.4.0-10"
 
 install_dir "/.dapp/deps/ansible/#{DOCKER_IMAGE_VERSION}"
 

diff --git a/dappdeps/ansible/omnibus/config/software/ansible.rb b/dappdeps/ansible/omnibus/config/software/ansible.rb
@@ -1,10 +1,11 @@
 name "ansible"
 
-ANSIBLE_GIT_TAG = "v2.4.4.0+dapp-5"
+ANSIBLE_GIT_TAG = "v2.4.4.0+dapp-6"
 
 dependency "python"
 dependency "pip"
 
 build do
   command "#{install_dir}/embedded/bin/pip install https://github.com/flant/ansible/archive/#{ANSIBLE_GIT_TAG}.tar.gz"
+  command "#{install_dir}/embedded/bin/pip install pyopenssl"
 end
diff --git a/lib/dapp/dimg/builder/ansible.rb b/lib/dapp/dimg/builder/ansible.rb
@@ -2,7 +2,7 @@ module Dapp
   module Dimg
     class Builder::Ansible < Builder::Base
 
-      ANSIBLE_IMAGE_VERSION = "2.4.4.0-9"
+      ANSIBLE_IMAGE_VERSION = "2.4.4.0-10"
 
       def ansible_bin
         "/.dapp/deps/ansible/#{ANSIBLE_IMAGE_VERSION}/embedded/bin/ansible"

diff --git a/pkg/config/raw_ansible_task.go b/pkg/config/raw_ansible_task.go
@@ -62,7 +62,7 @@ func supportedModules() []string {
 	// Commands Modules
 	modules = append(modules, []string{"command", "shell", "raw", "script"}...)
 	// Files Modules
-	modules = append(modules, []string{"archive", "unarchive", "blockinfile", "lineinfile", "file", "find", "tempfile", "copy", "acl", "xattr"}...)
+	modules = append(modules, []string{"assemble", "archive", "unarchive", "blockinfile", "lineinfile", "file", "find", "tempfile", "copy", "acl", "xattr", "ini_file", "iso_extract"}...)
 	// Net Tools Modules
 	modules = append(modules, []string{"get_url", "slurp", "uri"}...)
 	// Packaging Modules
@@ -71,6 +71,9 @@ func supportedModules() []string {
 	modules = append(modules, []string{"user", "group", "getent", "locale_gen"}...)
 	// Utilities Modules
 	modules = append(modules, []string{"assert", "debug", "set_fact", "wait_for"}...)
+	// Crypto Modules
+	modules = append(modules, []string{"openssl_certificate", "openssl_csr", "openssl_privatekey", "openssl_publickey"}...)
+
 	return modules
 }