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 +4 -4
- data/.gitignore +3 -0
- data/lib/amoeba_deploy_tools/command.rb +4 -1
- data/lib/amoeba_deploy_tools/version.rb +1 -1
- metadata +1 -1
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: dce4c915e838e807df8eb32c7748353f14d7004b
|
4
|
+
data.tar.gz: 202fe2f082ba1f9dbece2cca1390e9854755716a
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 470f60ed61ab9b982f3f0da78b407f52ab23069219f44bba8f663567e0b0a1dcd07708e483a412f292c0823cc804001d95df29f7598243fb39c7da42e4e207a8
|
7
|
+
data.tar.gz: d42b3410133d28cc34615b35201450ecfbdce8ff3ace087e1f40f7c2908d34737c1ddcc79acf765dd3c70f7a1f0b9d6c18ef60cffebf713a7c9802d9be503711
|
data/.gitignore
CHANGED
@@ -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
|
|