tiller 0.9.3 → 0.9.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 15b6d2bae8088a2cdff87c27892257063b0bce78
-  data.tar.gz: 499654583932982792992a5ba48e337f9ba4930f
+  metadata.gz: 9a9e59b53054ab622d4627c753fa3dfd770e96d2
+  data.tar.gz: 06b68072cad4551bd719d75a781dda4a615e2684
 SHA512:
-  metadata.gz: c7a7fdf2f42bfa81891644495754a0b705b8a706b737e39671606c2a2bce6cd5f4e8c576f019fd603a23de85ad1fbefdd18f072c3a46914e51d0c6d23c6c78e5
-  data.tar.gz: afce5ef800ef253760bba24311eeb56474ea0889cdb4dd3f1ef44704e272fbda3bcd005b1b320f10b691b44bdbc40099af3b609d248c2487aee4185f4948e1af
+  metadata.gz: 5505a2fb4696e0ebeccf32b57d3ec8ae6709f5dd0498681ff8c01623a5a542beb3f9d4f21b98a116428cb629d5610d2224d4b904c87a50bb98891528360344fe
+  data.tar.gz: e57a8bf3bd36f48fb7c9fa37f4bb9a2e530cb11b23b2a0b5ce0403aa791d6695b3dcd3dddb5db29bb62ca93acbd6640546118b7c0955f1607a89bc8b4fd6384d

data/lib/tiller/data/ansible_vault.rb

@@ -0,0 +1,56 @@
+if RUBY_VERSION < "2.1.0"
+  raise("Ansible Vault plugin requires Ruby >= 2.1.0")
+end
+
+require 'ansible/vault'
+require 'tiller/util'
+require 'yaml'
+require 'pp'
+
+class AnsibleVaultDataSource < Tiller::DataSource
+
+  def setup
+
+    @ansible_vault_config = Tiller::AnsibleVault.defaults
+
+    unless Tiller::config.has_key?('ansible_vault')
+      Tiller::log.info('No Ansible vault configuration block for this environment')
+      return
+    end
+
+    @ansible_vault_config.deep_merge!(Tiller::config['ansible_vault'])
+
+    # Get the password
+    if ENV.has_key?(@ansible_vault_config['vault_password_env'])
+      Tiller::log.debug("#{self} : Using password from environment variable #{@ansible_vault_config['vault_password_env']}")
+      @password = ENV[@ansible_vault_config['vault_password_env']]
+    elsif @ansible_vault_config.has_key?('vault_password')
+      Tiller::log.debug('#{self} : Using password from configuration block')
+      @password = @ansible_vault_config['vault_password']
+    elsif @ansible_vault_config.has_key?('vault_password_file')
+      Tiller::log.debug("#{self} : Using password from file #{@ansible_vault_config['vault_password_file']}")
+      @password = File.read(@ansible_vault_config['vault_password_file'])
+    else
+      raise('No Ansible Vault password provided')
+    end
+
+    # Open and decrypt the vault
+    begin
+      contents = Ansible::Vault.read(path: @ansible_vault_config['vault_file'], password: @password)
+      @ansible_vault = YAML.load(contents)
+    rescue Psych::SyntaxError
+      raise('ERROR : Decrypted Ansible Vault file is not valid YAML')
+    rescue Errno::ENOENT
+      raise("Could not open Ansible Vault file #{@ansible_vault_config['vault_file']}")
+    end
+
+
+  end
+
+
+  def global_values
+    return {} unless Tiller::config.has_key?('ansible_vault')
+    @ansible_vault
+  end
+
+end

data/lib/tiller/defaults.rb

@@ -95,3 +95,11 @@ module Tiller::Environment
     }
   end
 end
+
+module Tiller::AnsibleVault
+  def self.defaults
+    {
+        'vault_password_env'  => 'ANSIBLE_VAULT_PASS'
+    }
+  end
+end

data/lib/tiller/version.rb

@@ -1 +1 @@
-VERSION="0.9.3"
+VERSION="0.9.4"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tiller
 version: !ruby/object:Gem::Version
-  version: 0.9.3
+  version: 0.9.4
 platform: ruby
 authors:
 - Mark Dastmalchi-Round
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-07 00:00:00.000000000 Z
+date: 2016-09-21 00:00:00.000000000 Z
 dependencies: []
 description: A tool to create configuration files from a variety of sources, particularly
   useful for Docker containers. See https://github.com/markround/tiller for examples
@@ -28,6 +28,7 @@ files:
 - lib/tiller/api/handlers/template.rb
 - lib/tiller/api/handlers/templates.rb
 - lib/tiller/consul.rb
+- lib/tiller/data/ansible_vault.rb
 - lib/tiller/data/consul.rb
 - lib/tiller/data/defaults.rb
 - lib/tiller/data/environment.rb