openstack/puppet-openstack_extras
Code Issues Proposed changes

Merge "Replace verify_contents"

Browse Source
This commit is contained in:
Zuul
2025-09-16 05:30:35 +00:00
committed by Gerrit Code Review
parent 86834aac70 44dbbd2c4c
commit 26b8504221
1 changed files with 77 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

134
spec/classes/openstack_extras_auth_file_spec.rb
View File

@@ -16,29 +16,27 @@ describe 'openstack_extras::auth_file' do
:mode => '0700',
:show_diff => false,
:tag => ['openrc'],
:content => <<EOS
#!/bin/sh
export OS_NO_CACHE='true'
export OS_PROJECT_NAME='openstack'
export OS_USERNAME='admin'
export OS_PASSWORD='admin'
export OS_AUTH_URL='http://127.0.0.1:5000/v3/'
export OS_AUTH_STRATEGY='keystone'
export OS_REGION_NAME='RegionOne'
export OS_PROJECT_DOMAIN_NAME='Default'
export OS_USER_DOMAIN_NAME='Default'
export OS_INTERFACE='public'
export OS_ENDPOINT_TYPE='publicURL'
export CINDER_ENDPOINT_TYPE='publicURL'
export GLANCE_ENDPOINT_TYPE='publicURL'
export KEYSTONE_ENDPOINT_TYPE='publicURL'
export NOVA_ENDPOINT_TYPE='publicURL'
export NEUTRON_ENDPOINT_TYPE='publicURL'
export OS_IDENTITY_API_VERSION='3'
EOS
)}
it {
verify_contents(catalogue, '/root/openrc', [
'export OS_NO_CACHE=\'true\'',
'export OS_PROJECT_NAME=\'openstack\'',
'export OS_USERNAME=\'admin\'',
'export OS_PASSWORD=\'admin\'',
'export OS_AUTH_URL=\'http://127.0.0.1:5000/v3/\'',
'export OS_AUTH_STRATEGY=\'keystone\'',
'export OS_REGION_NAME=\'RegionOne\'',
'export OS_PROJECT_DOMAIN_NAME=\'Default\'',
'export OS_USER_DOMAIN_NAME=\'Default\'',
'export OS_INTERFACE=\'public\'',
'export OS_ENDPOINT_TYPE=\'publicURL\'',
'export CINDER_ENDPOINT_TYPE=\'publicURL\'',
'export GLANCE_ENDPOINT_TYPE=\'publicURL\'',
'export KEYSTONE_ENDPOINT_TYPE=\'publicURL\'',
'export NOVA_ENDPOINT_TYPE=\'publicURL\'',
'export NEUTRON_ENDPOINT_TYPE=\'publicURL\'',
'export OS_IDENTITY_API_VERSION=\'3\'',
])
}
end
context 'when overriding parameters' do
@@ -79,36 +77,34 @@ describe 'openstack_extras::auth_file' do
:mode => '0700',
:show_diff => false,
:tag => ['openrc'],
:content => <<EOS
#!/bin/sh
export OS_SERVICE_TOKEN='servicetoken'
export OS_SERVICE_ENDPOINT='http://127.0.0.2:5000/v3/'
export OS_NO_CACHE='false'
export OS_PROJECT_NAME='myproject'
export OS_USERNAME='myuser'
export OS_PASSWORD='admin'
export OS_AUTH_URL='http://127.0.0.2:5000/v3/'
export OS_AUTH_STRATEGY='no_auth'
export OS_REGION_NAME='myregion'
export OS_PROJECT_DOMAIN_NAME='anotherdomain'
export OS_USER_DOMAIN_NAME='anotherdomain'
export OS_INTERFACE='internal'
export OS_ENDPOINT_TYPE='internalURL'
export CINDER_ENDPOINT_TYPE='internalURL'
export GLANCE_ENDPOINT_TYPE='internalURL'
export KEYSTONE_ENDPOINT_TYPE='internalURL'
export NOVA_ENDPOINT_TYPE='internalURL'
export NEUTRON_ENDPOINT_TYPE='internalURL'
export OS_COMPUTE_API_VERSION='2.1'
export OS_NETWORK_API_VERSION='2.0'
export OS_IMAGE_API_VERSION='2'
export OS_VOLUME_API_VERSION='2'
export OS_IDENTITY_API_VERSION='3.1'
export OS_OBJECT_API_VERSION='1'
EOS
)}
it {
verify_contents(catalogue, '/path/to/file', [
'export OS_SERVICE_TOKEN=\'servicetoken\'',
'export OS_SERVICE_ENDPOINT=\'http://127.0.0.2:5000/v3/\'',
'export OS_NO_CACHE=\'false\'',
'export OS_PROJECT_NAME=\'myproject\'',
'export OS_USERNAME=\'myuser\'',
'export OS_PASSWORD=\'admin\'',
'export OS_AUTH_URL=\'http://127.0.0.2:5000/v3/\'',
'export OS_AUTH_STRATEGY=\'no_auth\'',
'export OS_REGION_NAME=\'myregion\'',
'export OS_PROJECT_DOMAIN_NAME=\'anotherdomain\'',
'export OS_USER_DOMAIN_NAME=\'anotherdomain\'',
'export OS_INTERFACE=\'internal\'',
'export OS_ENDPOINT_TYPE=\'internalURL\'',
'export CINDER_ENDPOINT_TYPE=\'internalURL\'',
'export GLANCE_ENDPOINT_TYPE=\'internalURL\'',
'export KEYSTONE_ENDPOINT_TYPE=\'internalURL\'',
'export NOVA_ENDPOINT_TYPE=\'internalURL\'',
'export NEUTRON_ENDPOINT_TYPE=\'internalURL\'',
'export OS_COMPUTE_API_VERSION=\'2.1\'',
'export OS_NETWORK_API_VERSION=\'2.0\'',
'export OS_IMAGE_API_VERSION=\'2\'',
'export OS_VOLUME_API_VERSION=\'2\'',
'export OS_IDENTITY_API_VERSION=\'3.1\'',
'export OS_OBJECT_API_VERSION=\'1\'',
])
}
end
context 'handle password and token with single quotes' do
@@ -119,12 +115,36 @@ describe 'openstack_extras::auth_file' do
}
end
it {
verify_contents(catalogue, '/root/openrc', [
'export OS_SERVICE_TOKEN=\'key\\\'stone\'',
'export OS_PASSWORD=\'singlequote\\\'\'',
])
}
it { is_expected.to contain_file('/root/openrc').with(
:ensure => 'file',
:owner => 'root',
:group => 'root',
:mode => '0700',
:show_diff => false,
:tag => ['openrc'],
:content => <<EOS
#!/bin/sh
export OS_SERVICE_TOKEN='key\\'stone'
export OS_SERVICE_ENDPOINT='http://127.0.0.1:5000/v3/'
export OS_NO_CACHE='true'
export OS_PROJECT_NAME='openstack'
export OS_USERNAME='admin'
export OS_PASSWORD='singlequote\\''
export OS_AUTH_URL='http://127.0.0.1:5000/v3/'
export OS_AUTH_STRATEGY='keystone'
export OS_REGION_NAME='RegionOne'
export OS_PROJECT_DOMAIN_NAME='Default'
export OS_USER_DOMAIN_NAME='Default'
export OS_INTERFACE='public'
export OS_ENDPOINT_TYPE='publicURL'
export CINDER_ENDPOINT_TYPE='publicURL'
export GLANCE_ENDPOINT_TYPE='publicURL'
export KEYSTONE_ENDPOINT_TYPE='publicURL'
export NOVA_ENDPOINT_TYPE='publicURL'
export NEUTRON_ENDPOINT_TYPE='publicURL'
export OS_IDENTITY_API_VERSION='3'
EOS
)}
end
context 'when the file is in /tmp' do