diff options
| author | Thom May <thom@chef.io> | 2018-05-02 14:51:30 +0100 |
|---|---|---|
| committer | Thom May <thom@chef.io> | 2018-05-02 15:20:11 +0100 |
| commit | cf9fa5c5d903c8b81728d53281b3eef70913fd45 (patch) | |
| tree | 79f1b6ad6238e31eb6cc23a6b1a77baad7af6a31 /habitat/config | |
| parent | a83949542458218908db56256add2f3da3618006 (diff) | |
| download | chef-cf9fa5c5d903c8b81728d53281b3eef70913fd45.tar.gz | |
Update hab plan to current standardselliott/update_hab_plan
Also tidy up the config a bit
Signed-off-by: Thom May <thom@chef.io>
Diffstat (limited to 'habitat/config')
| -rw-r--r-- | habitat/config/client.rb | 11 | ||||
| -rw-r--r-- | habitat/config/data_collector_metadata.json | 1 |
2 files changed, 4 insertions, 8 deletions
diff --git a/habitat/config/client.rb b/habitat/config/client.rb index 1b1f512184..2d28d223c5 100644 --- a/habitat/config/client.rb +++ b/habitat/config/client.rb @@ -1,16 +1,10 @@ -cookbook_path "{{pkg.svc_data_path}}/{{cfg.cookbook_path}}" -data_bag_path "{{pkg.svc_data_path}}/{{cfg.data_bag_path}}" -environment_path "{{pkg.svc_data_path}}/{{cfg.environment_path}}" +chef_repo_path "{{pkg.svc_data_path}}/chef" file_backup_path "{{pkg.svc_data_path}}/{{cfg.file_backup_path}}" -node_path "{{pkg.svc_data_path}}/{{cfg.node_path}}" -role_path "{{pkg.svc_data_path}}/{{cfg.role_path}}" pid_file "{{pkg.svc_data_path}}/{{cfg.pid_file}}" data_collector.server_url "{{cfg.data_collector.url}}" data_collector.token "{{cfg.data_collector.token}}" data_collector.mode "{{cfg.data_collector.mode}}".to_sym data_collector.raise_on_failure {{cfg.data_collector.raise_on_failure}} -chef_repo_path "{{pkg.svc_data_path}}/chef" -environment "{{cfg.environment}}" minimal_ohai {{cfg.minimal_ohai}} {{#if cfg.chef-client.node_name ~}} node_name "{{cfg.node_name}}" @@ -19,3 +13,6 @@ splay {{cfg.splay}} interval {{cfg.interval}} log_location {{cfg.log_location}} log_level "{{cfg.log_level}}".to_sym +{{#if cfg.use_member_id_as_uuid ~}} +chef_guid "{{svc.me.member_id}}" +{{/if ~}} diff --git a/habitat/config/data_collector_metadata.json b/habitat/config/data_collector_metadata.json deleted file mode 100644 index 10a5f027d3..0000000000 --- a/habitat/config/data_collector_metadata.json +++ /dev/null @@ -1 +0,0 @@ -{"node_uuid": "{{svc.me.member_id}}"} |