amoeba_deploy_tools 0.0.6 → 0.0.7

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 082b7461020a456d7dacaff0ac316be3b723a6b8
4
- data.tar.gz: d4af53d3eedb6bed271c6318b55f1ebecb346ceb
3
+ metadata.gz: dce4c915e838e807df8eb32c7748353f14d7004b
4
+ data.tar.gz: 202fe2f082ba1f9dbece2cca1390e9854755716a
5
5
  SHA512:
6
- metadata.gz: 8c9dbf3ea7096f8fd8355506bca4893898a25c0a06103159c1657435b7e1bc6c9119b8013e82c539f150f322a1f0925874348956a1cf4f7d89584514c37358b2
7
- data.tar.gz: f34e25b98d8258c65c5c1451608faffc44ed7f367abd14d531762ccc968d46deb5467892266ca63f9acd9d1bab0a7a8f394bd2d1c8becb41719bd17ce01a30c4
6
+ metadata.gz: 470f60ed61ab9b982f3f0da78b407f52ab23069219f44bba8f663567e0b0a1dcd07708e483a412f292c0823cc804001d95df29f7598243fb39c7da42e4e207a8
7
+ data.tar.gz: d42b3410133d28cc34615b35201450ecfbdce8ff3ace087e1f40f7c2908d34737c1ddcc79acf765dd3c70f7a1f0b9d6c18ef60cffebf713a7c9802d9be503711
data/.gitignore CHANGED
@@ -32,3 +32,6 @@ doc/
32
32
 
33
33
  # Ignore Gemfile.lock in this since it's a gem
34
34
  Gemfile.lock
35
+
36
+ # Ignore our own config files
37
+ .amoeba.yml
@@ -82,8 +82,11 @@ module AmoebaDeployTools
82
82
  @deployment.deep_merge!(node.deployment) if node.deployment
83
83
 
84
84
  provider = data_bag(:providers)[node.deployment.provider] if node.deployment_.provider
85
-
86
85
  @deployment.deep_merge!(provider) if provider
86
+
87
+ # Remove ident if we have a remote node, as host keys should be managed by us
88
+ @deployment.delete('ident') if remote_node
89
+
87
90
  @deployment.deep_merge!(remote_node.deployment) if remote_node.deployment
88
91
  @deployment.deep_merge!(node.deployment)
89
92
 
@@ -1,3 +1,3 @@
1
1
  module AmoebaDeployTools
2
- VERSION = "0.0.6"
2
+ VERSION = "0.0.7"
3
3
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: amoeba_deploy_tools
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.0.6
4
+ version: 0.0.7
5
5
  platform: ruby
6
6
  authors:
7
7
  - Daniel Jabbour