diff options
author | Tim Smith <tsmith@chef.io> | 2017-09-18 13:36:54 -0700 |
---|---|---|
committer | Tim Smith <tsmith@chef.io> | 2017-09-18 13:36:54 -0700 |
commit | 5dde6e6ccad4c11b2b5229a1aa0899e2dfd75b34 (patch) | |
tree | a7115b0cecc5f27c627a4bff44127b44120c86f1 /kitchen-tests/cookbooks | |
parent | 535d83aa9deeca2b33ae6f951e1c9597782da98c (diff) | |
download | chef-5dde6e6ccad4c11b2b5229a1aa0899e2dfd75b34.tar.gz |
Remove the webapp cookbook from integration tests
This isn't coming back. We'll replace it with the learnchef stuff in another PR.
Signed-off-by: Tim Smith <tsmith@chef.io>
Diffstat (limited to 'kitchen-tests/cookbooks')
-rw-r--r-- | kitchen-tests/cookbooks/base/recipes/default.rb | 2 | ||||
-rw-r--r-- | kitchen-tests/cookbooks/base/recipes/packages.rb | 2 | ||||
-rw-r--r-- | kitchen-tests/cookbooks/base/recipes/tests.rb | 2 | ||||
-rw-r--r-- | kitchen-tests/cookbooks/webapp/Berksfile | 3 | ||||
-rw-r--r-- | kitchen-tests/cookbooks/webapp/README.md | 3 | ||||
-rw-r--r-- | kitchen-tests/cookbooks/webapp/attributes/default.rb | 14 | ||||
-rw-r--r-- | kitchen-tests/cookbooks/webapp/metadata.rb | 11 | ||||
-rw-r--r-- | kitchen-tests/cookbooks/webapp/recipes/default.rb | 63 | ||||
-rw-r--r-- | kitchen-tests/cookbooks/webapp/templates/index.html.erb | 5 | ||||
-rw-r--r-- | kitchen-tests/cookbooks/webapp/templates/index.php.erb | 8 |
10 files changed, 3 insertions, 110 deletions
diff --git a/kitchen-tests/cookbooks/base/recipes/default.rb b/kitchen-tests/cookbooks/base/recipes/default.rb index 0c8341ca9a..bc98981d5d 100644 --- a/kitchen-tests/cookbooks/base/recipes/default.rb +++ b/kitchen-tests/cookbooks/base/recipes/default.rb @@ -1,5 +1,5 @@ # -# Cookbook:: webapp +# Cookbook:: base # Recipe:: default # # Copyright:: 2014-2017, Chef Software, Inc. diff --git a/kitchen-tests/cookbooks/base/recipes/packages.rb b/kitchen-tests/cookbooks/base/recipes/packages.rb index bb5fa7bb71..a448936acd 100644 --- a/kitchen-tests/cookbooks/base/recipes/packages.rb +++ b/kitchen-tests/cookbooks/base/recipes/packages.rb @@ -1,5 +1,5 @@ # -# Cookbook:: webapp +# Cookbook:: base # Recipe:: packages # # Copyright:: 2014-2017, Chef Software, Inc. diff --git a/kitchen-tests/cookbooks/base/recipes/tests.rb b/kitchen-tests/cookbooks/base/recipes/tests.rb index 8b90b48c5d..c6095eaeb5 100644 --- a/kitchen-tests/cookbooks/base/recipes/tests.rb +++ b/kitchen-tests/cookbooks/base/recipes/tests.rb @@ -1,5 +1,5 @@ # -# Cookbook:: webapp +# Cookbook:: base # Recipe:: tests # # Copyright:: 2014-2017, Chef Software, Inc. diff --git a/kitchen-tests/cookbooks/webapp/Berksfile b/kitchen-tests/cookbooks/webapp/Berksfile deleted file mode 100644 index 967b9a78b6..0000000000 --- a/kitchen-tests/cookbooks/webapp/Berksfile +++ /dev/null @@ -1,3 +0,0 @@ -source "https://supermarket.chef.io" - -metadata diff --git a/kitchen-tests/cookbooks/webapp/README.md b/kitchen-tests/cookbooks/webapp/README.md deleted file mode 100644 index caa0059689..0000000000 --- a/kitchen-tests/cookbooks/webapp/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# webapp - -A test cookbook that setups up a sample webapp to exercise a common workflow for chef cookbooks. diff --git a/kitchen-tests/cookbooks/webapp/attributes/default.rb b/kitchen-tests/cookbooks/webapp/attributes/default.rb deleted file mode 100644 index 2ff7a6c5ff..0000000000 --- a/kitchen-tests/cookbooks/webapp/attributes/default.rb +++ /dev/null @@ -1,14 +0,0 @@ -default["apache"]["remote_host_ip"] = "127.0.0.1" - -default["webapp"]["database"] = "webapp" -default["webapp"]["db_username"] = "webapp" -default["webapp"]["path"] = "/srv/webapp" - -# XXX: apache2 cookbook 2.0.0 has bugs around changing the mpm and then attempting a graceful restart -# which fails and leaves the service down. -case node["platform"] -when "ubuntu" - if node["platform_version"].to_f >= 14.04 - default[:apache][:mpm] = "event" - end -end diff --git a/kitchen-tests/cookbooks/webapp/metadata.rb b/kitchen-tests/cookbooks/webapp/metadata.rb deleted file mode 100644 index f0ce5ac040..0000000000 --- a/kitchen-tests/cookbooks/webapp/metadata.rb +++ /dev/null @@ -1,11 +0,0 @@ -name "webapp" -maintainer "" -maintainer_email "" -license "Apache-2.0" -description "Installs/Configures webapp" -long_description "Installs/Configures webapp" -version "0.1.0" - -depends "apache2", "~> 4.0.0" -depends "database", "~> 6.1.1" -depends "php", "~> 4.5.0" diff --git a/kitchen-tests/cookbooks/webapp/recipes/default.rb b/kitchen-tests/cookbooks/webapp/recipes/default.rb deleted file mode 100644 index 7f3b1804ab..0000000000 --- a/kitchen-tests/cookbooks/webapp/recipes/default.rb +++ /dev/null @@ -1,63 +0,0 @@ -# -# Cookbook Name:: webapp -# Recipe:: default -# -# Copyright:: Chef Software, Inc. 2016-2017 -# - -include_recipe "apache2" -include_recipe "php" - -creds = Hash.new -%w{mysql webapp}.each do |item_name| - creds[item_name] = data_bag_item("passwords", item_name) -end - -web_app "webapp" do - server_name "localhost" - server_aliases [node["fqdn"], node["hostname"], "localhost.localdomain"] - docroot node["webapp"]["path"] - cookbook "apache2" -end - -mysql_service "default" do - server_root_password creds["mysql"]["server_root_password"] - server_repl_password creds["mysql"]["server_repl_password"] -end - -mysql_database node["webapp"]["database"] do - connection ({ - :host => "localhost", - :username => "root", - :password => creds["mysql"]["server_root_password"], - }) - action :create -end - -mysql_database_user node["webapp"]["db_username"] do - connection ({ - :host => "localhost", - :username => "root", - :password => creds["mysql"]["server_root_password"], - }) - password creds["webapp"]["db_password"] - database_name node["webapp"]["database"] - privileges [:select, :update, :insert, :create, :delete] - action :grant -end - -directory node["webapp"]["path"] do - owner "root" - group "root" - mode "0755" - action :create - recursive true -end - -template "#{node['webapp']['path']}/index.html" do - source "index.html.erb" -end - -template "#{node['webapp']['path']}/index.php" do - source "index.php.erb" -end diff --git a/kitchen-tests/cookbooks/webapp/templates/index.html.erb b/kitchen-tests/cookbooks/webapp/templates/index.html.erb deleted file mode 100644 index 6da0629b9e..0000000000 --- a/kitchen-tests/cookbooks/webapp/templates/index.html.erb +++ /dev/null @@ -1,5 +0,0 @@ -<html> - <body> - <h1>Hello, World!</h1> - </body> -</html> diff --git a/kitchen-tests/cookbooks/webapp/templates/index.php.erb b/kitchen-tests/cookbooks/webapp/templates/index.php.erb deleted file mode 100644 index b08b076614..0000000000 --- a/kitchen-tests/cookbooks/webapp/templates/index.php.erb +++ /dev/null @@ -1,8 +0,0 @@ -<html> - <head> - <title>PHP Test</title> - </head> - <body> - <?php echo '<p>Hello, World!</p>'; ?> - </body> -</html> |