Add beaker test for ca_text parameter and use electrical's docker image for testing
This commit is contained in:
Родитель
54b2a9599e
Коммит
c7d1e9a762
|
@ -7,3 +7,4 @@ spec/fixtures
|
|||
.vagrant
|
||||
.*sw*
|
||||
pkg/
|
||||
log/
|
||||
|
|
|
@ -3,11 +3,13 @@ require 'spec_helper_acceptance'
|
|||
describe 'ca_cert::ca', :unless => UNSUPPORTED_PLATFORMS.include?(fact('osfamily')) do
|
||||
case fact('osfamily')
|
||||
when 'Debian'
|
||||
TRUSTED_CA_FILE = '/usr/local/share/ca-certificates/Globalsign_Org_Intermediate.crt'
|
||||
ABSENT_CA_FILE = '/etc/pki/ca-trust/source/blacklist/CACert.crt'
|
||||
TRUSTED_CA_FILE_REMOTE = '/usr/local/share/ca-certificates/Globalsign_Org_Intermediate.crt'
|
||||
ABSENT_CA_FILE_REMOTE = '/etc/pki/ca-trust/source/blacklist/CACert.crt'
|
||||
TRUSTED_CA_FILE_TEXT = '/usr/local/share/ca-certificates/InCommon.crt'
|
||||
when 'RedHat'
|
||||
TRUSTED_CA_FILE = '/etc/pki/ca-trust/source/anchors/Globalsign_Org_Intermediate.crt'
|
||||
UNTRUSTED_CA_FILE = '/etc/pki/ca-trust/source/blacklist/CACert.crt'
|
||||
TRUSTED_CA_FILE_REMOTE = '/etc/pki/ca-trust/source/anchors/Globalsign_Org_Intermediate.crt'
|
||||
UNTRUSTED_CA_FILE_REMOTE = '/etc/pki/ca-trust/source/blacklist/CACert.crt'
|
||||
TRUSTED_CA_FILE_TEXT = '/etc/pki/ca-trust/source/anchors/InCommon.crt'
|
||||
end
|
||||
|
||||
describe 'running puppet code' do
|
||||
|
@ -19,6 +21,37 @@ describe 'ca_cert::ca', :unless => UNSUPPORTED_PLATFORMS.include?(fact('osfamily
|
|||
source => 'http://secure.globalsign.com/cacert/gsorganizationvalsha2g2r1.crt',
|
||||
}
|
||||
|
||||
ca_cert::ca { 'InCommon':
|
||||
ca_text => '-----BEGIN CERTIFICATE-----
|
||||
MIIEwzCCA6ugAwIBAgIQf3HB06ImsNKxE/PmgWdkPjANBgkqhkiG9w0BAQUFADBv
|
||||
MQswCQYDVQQGEwJTRTEUMBIGA1UEChMLQWRkVHJ1c3QgQUIxJjAkBgNVBAsTHUFk
|
||||
ZFRydXN0IEV4dGVybmFsIFRUUCBOZXR3b3JrMSIwIAYDVQQDExlBZGRUcnVzdCBF
|
||||
eHRlcm5hbCBDQSBSb290MB4XDTEwMTIwNzAwMDAwMFoXDTIwMDUzMDEwNDgzOFow
|
||||
UTELMAkGA1UEBhMCVVMxEjAQBgNVBAoTCUludGVybmV0MjERMA8GA1UECxMISW5D
|
||||
b21tb24xGzAZBgNVBAMTEkluQ29tbW9uIFNlcnZlciBDQTCCASIwDQYJKoZIhvcN
|
||||
AQEBBQADggEPADCCAQoCggEBAJd8x8j+s+kgaqOkT46ONFYGs3psqhCbSGErNpBp
|
||||
4zQKR6e7e96qavvrgpWPyh1/r3WmqEzaIGdhGg2GwcrBh6+sTuTeYhsvnbGYr8YB
|
||||
+xdw26wUWexvPzN/ppgL5OI4r/V/hW0OdASd9ieGx5uP53EqCPQDAkBjJH1AV49U
|
||||
4FR+thNIYfHezg69tvpNmLLZDY15puCqzQyRmqXfq3O7yhR4XEcpocrFup/H2mD3
|
||||
/+d/8tnaoS0PSRan0wCSz4pH2U341ZVm03T5gGMAT0yEFh+z9SQfoU7e6JXWsgsJ
|
||||
iyxrx1wvjGPJmctSsWJ7cwFif2Ns2Gig7mqojR8p89AYrK0CAwEAAaOCAXcwggFz
|
||||
MB8GA1UdIwQYMBaAFK29mHo0tCb3+sQmVO8DveAky1QaMB0GA1UdDgQWBBRIT1r6
|
||||
L0qaXuBQ82t7VaXe9b40XTAOBgNVHQ8BAf8EBAMCAQYwEgYDVR0TAQH/BAgwBgEB
|
||||
/wIBADARBgNVHSAECjAIMAYGBFUdIAAwRAYDVR0fBD0wOzA5oDegNYYzaHR0cDov
|
||||
L2NybC51c2VydHJ1c3QuY29tL0FkZFRydXN0RXh0ZXJuYWxDQVJvb3QuY3JsMIGz
|
||||
BggrBgEFBQcBAQSBpjCBozA/BggrBgEFBQcwAoYzaHR0cDovL2NydC51c2VydHJ1
|
||||
c3QuY29tL0FkZFRydXN0RXh0ZXJuYWxDQVJvb3QucDdjMDkGCCsGAQUFBzAChi1o
|
||||
dHRwOi8vY3J0LnVzZXJ0cnVzdC5jb20vQWRkVHJ1c3RVVE5TR0NDQS5jcnQwJQYI
|
||||
KwYBBQUHMAGGGWh0dHA6Ly9vY3NwLnVzZXJ0cnVzdC5jb20wDQYJKoZIhvcNAQEF
|
||||
BQADggEBAJNmIYB0RYVLwqvOMrAp/t3f1iRbvwNqb1A+DhuzDYijW+7EpBI7Vu8G
|
||||
f89/IZVWO0Ex/uGqk9KV85UNPEerylwmrT7x+Yw0bhG+9GfjAkn5pnx7ZCXdF0by
|
||||
UOPjCiE6SSTNxoRlaGdosEUtR5nNnKuGKRFy3NacNkN089SXnlag/l9AWNLV1358
|
||||
xY4asgRckmYOha0uBs7Io9jrFCeR3s8XMIFTtmYSrTfk9e+WXCAONumsYn0ZgYr1
|
||||
kGGmSavOPN/mymTugmU5RZUWukEGAJi6DFZh5MbGhgHPZqkiKQLWPc/EKo2Z3vsJ
|
||||
FJ4O0dXG14HdrSSrrAcF4h1ow3BmX9M=
|
||||
-----END CERTIFICATE-----',
|
||||
}
|
||||
|
||||
ca_cert::ca { 'CACert':
|
||||
source => 'http://www.cacert.org/certs/root.crt',
|
||||
ensure => 'distrusted',
|
||||
|
@ -27,18 +60,22 @@ describe 'ca_cert::ca', :unless => UNSUPPORTED_PLATFORMS.include?(fact('osfamily
|
|||
|
||||
apply_manifest(pp, :catch_failures => true)
|
||||
end
|
||||
|
||||
describe file(TRUSTED_CA_FILE) do
|
||||
|
||||
describe file(TRUSTED_CA_FILE_REMOTE) do
|
||||
it { is_expected.to be_file }
|
||||
end
|
||||
|
||||
describe file(TRUSTED_CA_FILE_TEXT) do
|
||||
it { is_expected.to be_file }
|
||||
end
|
||||
|
||||
case fact('osfamily')
|
||||
when 'Debian'
|
||||
describe file(ABSENT_CA_FILE) do
|
||||
describe file(ABSENT_CA_FILE_REMOTE) do
|
||||
it { is_expected.to_not be_file }
|
||||
end
|
||||
when 'RedHat'
|
||||
describe file(UNTRUSTED_CA_FILE) do
|
||||
describe file(UNTRUSTED_CA_FILE_REMOTE) do
|
||||
it { is_expected.to be_file }
|
||||
end
|
||||
end
|
||||
|
|
|
@ -1,9 +1,12 @@
|
|||
HOSTS:
|
||||
ubuntu-12-04:
|
||||
platform: ubuntu-12.04-x64
|
||||
image: ubuntu:precise
|
||||
ubuntu-14-04:
|
||||
platform: ubuntu-14.04-x64
|
||||
platform: ubuntu-14.04-amd64
|
||||
image: electrical/ubuntu:14.04
|
||||
hypervisor: docker
|
||||
docker_cmd: '["/sbin/init"]'
|
||||
docker_image_commands:
|
||||
- 'apt-get install -yq wget net-tools curl lsb-release rubygems'
|
||||
CONFIG:
|
||||
- 'apt-get install -yq ruby ruby1.9.1-dev libaugeas-dev libaugeas-ruby lsb-release wget net-tools curl'
|
||||
docker_preserve_image: true
|
||||
CONFIG:
|
||||
type: foss
|
||||
|
|
|
@ -0,0 +1,12 @@
|
|||
HOSTS:
|
||||
ubuntu-12-04:
|
||||
platform: ubuntu-12.04-x64
|
||||
platform: ubuntu-12.04-amd64
|
||||
image: electrical/ubuntu:12.04
|
||||
hypervisor: docker
|
||||
docker_cmd: '["/sbin/init"]'
|
||||
docker_image_commands:
|
||||
- 'apt-get install -yq ruby1.8-dev libaugeas-dev libaugeas-ruby ruby rubygems lsb-release wget net-tools curl'
|
||||
docker_preserve_image: true
|
||||
CONFIG:
|
||||
type: foss
|
|
@ -1,12 +0,0 @@
|
|||
HOSTS:
|
||||
ubuntu-14-04:
|
||||
platform: ubuntu-14.04-x64
|
||||
image: ubuntu:trusty
|
||||
hypervisor: docker
|
||||
docker_image_commands:
|
||||
- 'apt-get install -yq wget net-tools curl lsb-release ruby ruby-dev'
|
||||
- "sed -ri 's/^session\\s+required\\s+pam_loginuid.so$/session optional pam_loginuid.so/g' /etc/pam.d/sshd"
|
||||
- "sed -ri 's/PermitRootLogin without-password/PermitRootLogin yes/g' /etc/ssh/sshd_config"
|
||||
- "sed -ri 's/PermitEmptyPasswords no/PermitEmptyPasswords yes/g' /etc/ssh/sshd_config"
|
||||
CONFIG:
|
||||
type: foss
|
Загрузка…
Ссылка в новой задаче