Cleanup uuid == docker
This was replaced with deployment_type a while back so uuid is now a proper value based on the system id. See https://review.opendev.org/#/c/607647/ Change-Id: Ica2f39e6bee697002984d0f28298338edf55ac4b
This commit is contained in:
parent
44091d184c
commit
6e26715894
|
@ -81,7 +81,7 @@ class tripleo::fencing(
|
|||
$level = regsubst($index, 'level', '', 'G')
|
||||
$all_devices = $levelx_devices
|
||||
|
||||
if $::uuid != 'docker' and $::deployment_type != 'containers' {
|
||||
if $::deployment_type != 'containers' {
|
||||
$xvm_devices = local_fence_devices('fence_xvm', $all_devices)
|
||||
create_resources('pacemaker::stonith::fence_xvm', $xvm_devices, $common_params)
|
||||
}
|
||||
|
|
|
@ -86,7 +86,7 @@ class tripleo::profile::base::database::mysql::client (
|
|||
# present in the base image but installed as a package afterwards),
|
||||
# create it. We do not want to touch the permissions in case it already
|
||||
# exists due to the mariadb server package being pre-installed
|
||||
if $::uuid == 'docker' or $::deployment_type == 'containers' {
|
||||
if $::deployment_type == 'containers' {
|
||||
# When generating configuration with docker-puppet, services do
|
||||
# not include any profile that would ensure creation of /etc/my.cnf.d,
|
||||
# so we enforce the check here.
|
||||
|
|
|
@ -57,7 +57,7 @@ class tripleo::profile::base::nova::libvirt (
|
|||
|
||||
# This removal of files in /etc/libvirt/qemu should not happen inside containers
|
||||
# Avoids LP#1819482
|
||||
if ! ($::uuid == 'docker' or $::deployment_type == 'containers') {
|
||||
if $::deployment_type != 'containers' {
|
||||
file { ['/etc/libvirt/qemu/networks/autostart/default.xml',
|
||||
'/etc/libvirt/qemu/networks/default.xml']:
|
||||
ensure => absent,
|
||||
|
|
|
@ -25,7 +25,7 @@ describe 'tripleo::profile::base::database::mysql::client' do
|
|||
end
|
||||
|
||||
before (:each) do
|
||||
facts.merge!({ :uuid => 'notdocker' })
|
||||
facts.merge!({ :deployment_type => 'notcontainers' })
|
||||
end
|
||||
|
||||
it {
|
||||
|
@ -46,13 +46,13 @@ describe 'tripleo::profile::base::database::mysql::client' do
|
|||
}
|
||||
end
|
||||
|
||||
context 'with defaults on docker' do
|
||||
context 'with defaults in containers' do
|
||||
let (:params) do
|
||||
{ :step => 1 }
|
||||
end
|
||||
|
||||
before (:each) do
|
||||
facts.merge!({ :uuid => 'docker' })
|
||||
facts.merge!({ :deployment_type => 'containers' })
|
||||
end
|
||||
|
||||
it {
|
||||
|
@ -76,7 +76,7 @@ describe 'tripleo::profile::base::database::mysql::client' do
|
|||
end
|
||||
|
||||
before (:each) do
|
||||
facts.merge!({ :uuid => 'notdocker', :deployment_type => 'containers' })
|
||||
facts.merge!({ :deployment_type => 'notcontainers', :deployment_type => 'containers' })
|
||||
end
|
||||
|
||||
it {
|
||||
|
@ -102,7 +102,7 @@ describe 'tripleo::profile::base::database::mysql::client' do
|
|||
end
|
||||
|
||||
before (:each) do
|
||||
facts.merge!({ :uuid => 'notdocker' })
|
||||
facts.merge!({ :deployment_type => 'notcontainers' })
|
||||
end
|
||||
|
||||
it {
|
||||
|
@ -129,7 +129,7 @@ describe 'tripleo::profile::base::database::mysql::client' do
|
|||
end
|
||||
|
||||
before (:each) do
|
||||
facts.merge!({ :uuid => 'notdocker' })
|
||||
facts.merge!({ :deployment_type => 'notcontainers' })
|
||||
end
|
||||
|
||||
it {
|
||||
|
|
Loading…
Reference in New Issue