Revert "introduce test-kitchen"
This reverts commit e80631d97e402794ad7d5793b831ae0555e581c4.
Change-Id: I771ad19d116a17fed19b3ffbdacea445f43ab4f9
diff --git a/tests/integration/cluster/inspec/horizon_spec.rb b/tests/integration/cluster/inspec/horizon_spec.rb
deleted file mode 100644
index cadccac..0000000
--- a/tests/integration/cluster/inspec/horizon_spec.rb
+++ /dev/null
@@ -1,87 +0,0 @@
-
-
-
-
-
-
-# TODO, enable helper files once resolved - https://github.com/chef/kitchen-inspec/issues/93
-#require 'spec_helper'
-param = {
- user: 'horizon',
- group: 'horizon',
-}
-
-# based on operating system we select the available service
-if ['centos', 'fedora', 'freebsd', 'opensuse'].include?(os[:family])
- # CentOS, Fedora
- service_nm = 'httpd'
- config = '/etc/openstack-dashboard/local_settings'
- apache_config = '/etc/httpd/conf.d/openstack-dashboard.conf'
-elsif ['debian', 'ubuntu'].include?(os[:family])
- # Debian, Ubuntu
- service_nm = 'apache'
- config = '/etc/openstack-dashboard/local_settings.py'
- apache_config = '/etc/apache2/conf-available/openstack-dashboard.conf'
-end
-
-control 'horizon' do
-
- # TODO, check for config files and content
- #debian
- #'config': '/etc/openstack-dashboard/local_settings.py',
- #'apache_config': '/etc/apache2/conf-available/openstack-dashboard.conf',
- #'port_config_file': '/etc/apache2/ports.conf',
- #'port_config_template': 'salt://horizon/files/ports.conf',
- #rhel
- #'config': '/etc/openstack-dashboard/local_settings',
- #'apache_config': '/etc/httpd/conf.d/openstack-dashboard.conf',
- #'port_config_file': '/etc/httpd/conf/httpd.conf',
- #'port_config_template': 'salt://horizon/files/httpd.conf',
-
-
- describe file(config) do
- it { should exist }
- its('content') { should match("SECRET_KEY = 'secret'") }
- #it { should be_owned_by param[:user] }
- #it { should be_grouped_into param[:group] }
- end
-end
-
-control 'apache config' do
- describe file(apache_config) do
- it { should exist }
- its('content') { should match("WSGIDaemonProcess horizon user=horizon group=horizon") }
- end
-end
-
-
-return
-return if ENV['DOCKER']
-
-#control 'web server' do
-
- #if os[:family] == 'ubuntu' && os[:release] >= '16.04'
- #describe systemd_service(service_nm) do
- #it { should be_enabled }
- #it { should be_installed }
- #it { should be_running }
- #end
- #else
- #describe_service(service_nm) do
- #it { should be_enabled }
- #it { should be_installed }
- #it { should be_running }
- #end
- #end
-
-
- #if os.unix?
- #describe port(80) do
- #it { should be_listening }
- #its('protocols') { should include('tcp') }
- #end
-
- #end
-#end
-
-
diff --git a/tests/integration/helpers/spec_helper.rb b/tests/integration/helpers/spec_helper.rb
deleted file mode 100644
index e69de29..0000000
--- a/tests/integration/helpers/spec_helper.rb
+++ /dev/null
diff --git a/tests/integration/single/inspec/horizon_spec.rb b/tests/integration/single/inspec/horizon_spec.rb
deleted file mode 100644
index cadccac..0000000
--- a/tests/integration/single/inspec/horizon_spec.rb
+++ /dev/null
@@ -1,87 +0,0 @@
-
-
-
-
-
-
-# TODO, enable helper files once resolved - https://github.com/chef/kitchen-inspec/issues/93
-#require 'spec_helper'
-param = {
- user: 'horizon',
- group: 'horizon',
-}
-
-# based on operating system we select the available service
-if ['centos', 'fedora', 'freebsd', 'opensuse'].include?(os[:family])
- # CentOS, Fedora
- service_nm = 'httpd'
- config = '/etc/openstack-dashboard/local_settings'
- apache_config = '/etc/httpd/conf.d/openstack-dashboard.conf'
-elsif ['debian', 'ubuntu'].include?(os[:family])
- # Debian, Ubuntu
- service_nm = 'apache'
- config = '/etc/openstack-dashboard/local_settings.py'
- apache_config = '/etc/apache2/conf-available/openstack-dashboard.conf'
-end
-
-control 'horizon' do
-
- # TODO, check for config files and content
- #debian
- #'config': '/etc/openstack-dashboard/local_settings.py',
- #'apache_config': '/etc/apache2/conf-available/openstack-dashboard.conf',
- #'port_config_file': '/etc/apache2/ports.conf',
- #'port_config_template': 'salt://horizon/files/ports.conf',
- #rhel
- #'config': '/etc/openstack-dashboard/local_settings',
- #'apache_config': '/etc/httpd/conf.d/openstack-dashboard.conf',
- #'port_config_file': '/etc/httpd/conf/httpd.conf',
- #'port_config_template': 'salt://horizon/files/httpd.conf',
-
-
- describe file(config) do
- it { should exist }
- its('content') { should match("SECRET_KEY = 'secret'") }
- #it { should be_owned_by param[:user] }
- #it { should be_grouped_into param[:group] }
- end
-end
-
-control 'apache config' do
- describe file(apache_config) do
- it { should exist }
- its('content') { should match("WSGIDaemonProcess horizon user=horizon group=horizon") }
- end
-end
-
-
-return
-return if ENV['DOCKER']
-
-#control 'web server' do
-
- #if os[:family] == 'ubuntu' && os[:release] >= '16.04'
- #describe systemd_service(service_nm) do
- #it { should be_enabled }
- #it { should be_installed }
- #it { should be_running }
- #end
- #else
- #describe_service(service_nm) do
- #it { should be_enabled }
- #it { should be_installed }
- #it { should be_running }
- #end
- #end
-
-
- #if os.unix?
- #describe port(80) do
- #it { should be_listening }
- #its('protocols') { should include('tcp') }
- #end
-
- #end
-#end
-
-
diff --git a/tests/pillar/cluster.sls b/tests/pillar/cluster.sls
index 0070ce5..3eb9909 100644
--- a/tests/pillar/cluster.sls
+++ b/tests/pillar/cluster.sls
@@ -4,12 +4,6 @@
version: liberty
secret_key: secret
session_timeout: 43200
- plugin:
- horizon_theme:
- theme_name: ubuntu
- source:
- engine: pkg
- name: openstack-dashboard-ubuntu-theme
wsgi:
processes: 3
threads: 10
@@ -28,7 +22,6 @@
port: 11211
identity:
engine: keystone
- encryption: encryption
host: 127.0.0.1
port: 5000
api_version: 2
@@ -52,4 +45,4 @@
- name: ctl03
host: 127.0.0.1
port: 80
- params: cookie ctl03 check inter 2000 fall 3
+ params: cookie ctl03 check inter 2000 fall 3
\ No newline at end of file
diff --git a/tests/pillar/single.sls b/tests/pillar/single.sls
index a678d49..827cd88 100644
--- a/tests/pillar/single.sls
+++ b/tests/pillar/single.sls
@@ -7,12 +7,6 @@
bind:
address: 127.0.0.1
port: 80
- plugin:
- horizon_theme:
- theme_name: ubuntu
- source:
- engine: pkg
- name: openstack-dashboard-ubuntu-theme
wsgi:
processes: 3
threads: 10
@@ -29,5 +23,4 @@
port: 5000
host: 127.0.0.1
encryption: encryption
- api_version: 2
-
+ api_version: 2
\ No newline at end of file