Remove webui provider for "consul_installation" resource

sous-chefs · Jan 17, 2017 · c22404a · c22404a
1 parent c639a3e
commit c22404a
Show file tree

Hide file tree

Showing 8 changed files with 0 additions and 205 deletions.
diff --git a/.kitchen.dokken.yml b/.kitchen.dokken.yml
@@ -99,17 +99,3 @@ suites:
           server: true
           datacenter: FortMeade
           encrypt: CGXC2NsXW4AvuB4h5ODYzQ==
-  - name: webui
-    provisioner:
-      policyfile: test/fixtures/policies/default.rb
-    attributes:
-      consul:
-        provider: binary
-        options:
-          version: 0.7.1
-        config:
-          bootstrap: true
-          server: true
-          ui: true
-          datacenter: FortMeade
-          encrypt: CGXC2NsXW4AvuB4h5ODYzQ==
diff --git a/.kitchen.yml b/.kitchen.yml
@@ -65,17 +65,6 @@ suites:
           provider: git
     excludes:
       - windows-2012r2
-  - name: webui
-    provisioner:
-      policyfile: test/fixtures/policies/default.rb
-    attributes:
-      consul:
-        config:
-          bootstrap: true
-          server: true
-          ui: true
-          datacenter: FortMeade
-          encrypt: CGXC2NsXW4AvuB4h5ODYzQ==
   - name: acl
     provisioner:
       policyfile: test/fixtures/policies/default.rb

diff --git a/libraries/consul_installation_webui.rb b/libraries/consul_installation_webui.rb
diff --git a/libraries/helpers.rb b/libraries/helpers.rb
@@ -52,25 +52,6 @@ def command(config_file, config_dir)
       end
     end
 
-    # 1 is command not found
-    def correct_version?(executable, version)
-      shell_out!(%{"#{executable}" version}, returns: [0, 1]).stdout.match version
-    end
-
-    def binary_checksum(item)
-      node['consul']['checksums'].fetch(binary_filename(item))
-    end
-
-    def binary_filename(item)
-      case item
-      when 'binary'
-        arch = arch_64? ? 'amd64' : '386'
-        ['consul', version, node['os'], arch].join('_')
-      when 'web_ui'
-        ['consul', version, 'web_ui'].join('_')
-      end
-    end
-
     def nssm_exe
       "#{node['nssm']['install_location']}\\nssm.exe"
     end

diff --git a/test/fixtures/cookbooks/consul_spec/recipes/consul_installation_webui.rb b/test/fixtures/cookbooks/consul_spec/recipes/consul_installation_webui.rb
diff --git a/test/fixtures/cookbooks/consul_spec/recipes/default.rb b/test/fixtures/cookbooks/consul_spec/recipes/default.rb
@@ -2,4 +2,3 @@
 include_recipe 'consul::default'
 include_recipe 'consul_spec::consul_definition'
 include_recipe 'consul_spec::consul_watch'
-include_recipe 'consul_spec::consul_installation_webui'
diff --git a/test/integration/webui/serverspec/webui_spec.rb b/test/integration/webui/serverspec/webui_spec.rb
diff --git a/test/spec/libraries/consul_installation_webui_spec.rb b/test/spec/libraries/consul_installation_webui_spec.rb