From 452d78c128511d10d5c313222b89728b580d3312 Mon Sep 17 00:00:00 2001 From: Thom May Date: Tue, 8 Nov 2016 11:41:40 +0000 Subject: [PATCH] Use solo_legacy_mode fully Signed-off-by: Thom May --- lib/chef-vault/item.rb | 4 ++-- lib/chef-vault/item_keys.rb | 4 ++-- spec/chef-vault/item_keys_spec.rb | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/chef-vault/item.rb b/lib/chef-vault/item.rb index 1ab8401..c813721 100644 --- a/lib/chef-vault/item.rb +++ b/lib/chef-vault/item.rb @@ -211,7 +211,7 @@ def save(item_id = @raw_data["id"]) encrypt! unless @encrypted # Now save the encrypted data - if Chef::Config[:solo] + if Chef::Config[:solo_legacy_mode] save_solo(item_id) else begin @@ -257,7 +257,7 @@ def to_json(*a) def destroy keys.destroy - if Chef::Config[:solo] + if Chef::Config[:solo_legacy_mode] data_bag_path = File.join(Chef::Config[:data_bag_path], data_bag) data_bag_item_path = File.join(data_bag_path, @raw_data["id"]) diff --git a/lib/chef-vault/item_keys.rb b/lib/chef-vault/item_keys.rb index 2fbba52..c706d5c 100644 --- a/lib/chef-vault/item_keys.rb +++ b/lib/chef-vault/item_keys.rb @@ -67,7 +67,7 @@ def admins end def save(item_id = @raw_data["id"]) - if Chef::Config[:solo] + if Chef::Config[:solo_legacy_mode] save_solo(item_id) else begin @@ -85,7 +85,7 @@ def save(item_id = @raw_data["id"]) end def destroy - if Chef::Config[:solo] + if Chef::Config[:solo_legacy_mode] data_bag_path = File.join(Chef::Config[:data_bag_path], data_bag) data_bag_item_path = File.join(data_bag_path, @raw_data["id"]) diff --git a/spec/chef-vault/item_keys_spec.rb b/spec/chef-vault/item_keys_spec.rb index ba4f4f7..b8bfd8e 100644 --- a/spec/chef-vault/item_keys_spec.rb +++ b/spec/chef-vault/item_keys_spec.rb @@ -105,7 +105,7 @@ describe "#save" do let(:data_bag_path) { Dir.mktmpdir("vault_item_keys") } before do - Chef::Config[:solo] = true + Chef::Config[:solo_legacy_mode] = true Chef::Config[:data_bag_path] = data_bag_path end