Remove the webui provider in favor of using config.

sous-chefs · Mar 17, 2016 · b25b15e · b25b15e
1 parent 20332b3
commit b25b15e
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 123 deletions.
diff --git a/.kitchen.yml b/.kitchen.yml
@@ -47,9 +47,12 @@ suites:
  - recipe[consul::default]
  attributes:
  consul:
- config: *default-config
- installation:
- provider: webui
+ config:
+ bootstrap: true
+ server: true
+ ui: true
+ datacenter: FortMeade
+ encrypt: CGXC2NsXW4AvuB4h5ODYzQ==
  excludes:
  - windows-2012r2
  - name: acl
@@ -84,17 +87,3 @@ suites:
  nssm_params:
  AppStdout: C:\foo\bar\out.log
  AppStderr: C:\foo\bar\err.log
- # - name: atlas
- # excludes:
- # - windows-2012r2
- # run_list:
- # - recipe[consul::default]
- # attributes:
- # consul:
- # config:
- # bootstrap: true
- # server: true
- # datacenter: fortmeade
- # atlas_join: true
- # atlas_infrastructure: <%= ENV.fetch('ATLAS_INFRASTRUCTURE', 'example/cluster') %>
- # atlas_token: <%= ENV.fetch('ATLAS_TOKEN', 'NOT_REAL') %>
diff --git a/libraries/consul_installation_webui.rb b/libraries/consul_installation_webui.rb
diff --git a/libraries/consul_service.rb b/libraries/consul_service.rb
@@ -42,13 +42,13 @@ class ConsulService < Chef::Resource
  # @!attribute nssm_params
  # @return [String]
  attribute(:nssm_params, kind_of: Hash, default: lazy { node['consul']['service']['nssm_params'] })
- # @!attribute consul_binary
+ # @!attribute program
  # The location of the Consul executable.
  # @return [String]
  attribute(:program, kind_of: String, default: '/usr/local/bin/consul')
 
  def command
- "#{consul_binary} agent -config-file=#{config_file} -config-dir=#{config_dir}"
+ "#{program} agent -config-file=#{config_file} -config-dir=#{config_dir}"
  end
 
  def default_environment