knife-ec-backup 1.1.7 → 1.1.8
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/chef/knife/ec_restore.rb +5 -2
- data/lib/knife_ec_backup/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: 555db6e18f609eb180e4903ce2ca211db5f33444
|
4
|
+
data.tar.gz: 07a794b5dbd08e1c383eb25072ff88e20cdfbcb5
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: d4679a94465e27cfdbb81930aa828fef32523df2dced01c7be95141691dfe91693ae8749e8003666879f8c04fa331bed31ca9a1a805a400006b9757f0d52ee37
|
7
|
+
data.tar.gz: 23e4d67586e1ff4b6c9e934ff770fdfe6c5bc14c5dcee06e6ba39ab67540f70d7bb7eec6e90f93b01ca2ddc7898c25bad3bef6c2cec1a984004cd8442132d48a
|
@@ -274,9 +274,12 @@ class Chef
|
|
274
274
|
(top_level_paths + group_paths + group_acl_paths + acl_paths).each do |path|
|
275
275
|
::ChefFS::FileSystem.copy_to(::ChefFS::FilePattern.new(path), chef_fs_config.local_fs, chef_fs_config.chef_fs, nil, config, ui, proc { |entry| chef_fs_config.format_path(entry) })
|
276
276
|
end
|
277
|
-
# restore clients to groups
|
277
|
+
# restore clients to groups, using the pivotal key again
|
278
|
+
Chef::Config[:node_name] = old_config['node_name']
|
279
|
+
Chef::Config[:client_key] = old_config['client_key']
|
280
|
+
Chef::Config.custom_http_headers = {}
|
278
281
|
['admins', 'billing-admins'].each do |group|
|
279
|
-
restore_group(
|
282
|
+
restore_group(::ChefFS::Config.new, group, :users => false)
|
280
283
|
end
|
281
284
|
ensure
|
282
285
|
CONFIG_VARS.each do |key|
|