openstack/puppet-tripleo
Code Issues Proposed changes

Include vendordata in nova-api and nova-metadata-api

Browse Source 
Since the removal of deprecated vendordata parameters in each classes
in puppet-nova[1], we should explicitly include nova::vendordata class
in nova-api and nova-metadata-api so that required parameters are set
in controller nodes.

[1] 296b106916

Conflicts:
	manifests/profile/base/nova/api.pp
	manifests/profile/base/nova/metadata.pp

Closes-Bug: #1879418
Change-Id: I62d21ea910a976b1ba36b3c9a943d3547b40b7fc
(cherry picked from commit 5df2066a87)
This commit is contained in:
Takashi Kajinami 2020-05-19 09:17:34 +09:00
parent 7e03324579
commit 658956db22
4 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
manifests/profile/base/nova/api.pp
View File

@ -127,6 +127,7 @@ class tripleo::profile::base::nova::api (
include ::nova::cors
include ::nova::network::neutron
include ::nova::pci
include ::nova::vendordata
}
# Temporarily disable Nova API deployed in WSGI
# https://bugs.launchpad.net/nova/+bug/1661360

1
manifests/profile/base/nova/metadata.pp
View File

@ -77,6 +77,7 @@ class tripleo::profile::base::nova::metadata (
include ::nova::cors
include ::nova::network::neutron
include ::nova::metadata
include ::nova::vendordata
include ::tripleo::profile::base::apache
class { '::nova::wsgi::apache_metadata':
ssl_cert => $tls_certfile,

8
spec/classes/tripleo_profile_base_nova_api_spec.rb
View File

@ -43,6 +43,8 @@ eos
is_expected.to_not contain_class('nova::keystone::authtoken')
is_expected.to_not contain_class('nova::api')
is_expected.to_not contain_class('nova::cors')
is_expected.to_not contain_class('nova::pci')
is_expected.to_not contain_class('nova::vendordata')
is_expected.to_not contain_class('nova::network::neutron')
is_expected.to_not contain_class('nova::wsgi::apache_api')
}
@ -61,6 +63,8 @@ eos
is_expected.to contain_class('nova::keystone::authtoken')
is_expected.to contain_class('nova::api')
is_expected.to contain_class('nova::cors')
is_expected.to contain_class('nova::pci')
is_expected.to contain_class('nova::vendordata')
is_expected.to contain_class('nova::network::neutron')
is_expected.to_not contain_class('nova::wsgi::apache_api')
}
@ -79,6 +83,8 @@ eos
is_expected.to contain_class('nova::keystone::authtoken')
is_expected.to_not contain_class('nova::api')
is_expected.to_not contain_class('nova::cors')
is_expected.to_not contain_class('nova::pci')
is_expected.to_not contain_class('nova::vendordata')
is_expected.to_not contain_class('nova::network::neutron')
is_expected.to_not contain_class('nova::wsgi::apache_api')
}
@ -114,6 +120,8 @@ eos
is_expected.to contain_class('nova::keystone::authtoken')
is_expected.to contain_class('nova::api')
is_expected.to contain_class('nova::cors')
is_expected.to contain_class('nova::pci')
is_expected.to contain_class('nova::vendordata')
is_expected.to contain_class('nova::network::neutron')
is_expected.to contain_class('nova::wsgi::apache_api')
}

6
spec/classes/tripleo_profile_base_nova_metadata_spec.rb
View File

@ -45,6 +45,7 @@ eos
is_expected.to_not contain_class('nova::wsgi::apache_metadata')
is_expected.to_not contain_class('nova::network::neutron')
is_expected.to_not contain_class('nova::metadata')
is_expected.to_not contain_class('nova::vendordata')
is_expected.to_not contain_class('tripleo::profile::base::apache')
}
end
@ -62,6 +63,7 @@ eos
is_expected.to_not contain_class('nova::wsgi::apache_metadata')
is_expected.to_not contain_class('nova::network::neutron')
is_expected.to_not contain_class('nova::metadata')
is_expected.to_not contain_class('nova::vendordata')
is_expected.to_not contain_class('tripleo::profile::base::apache')
}
end
@ -80,6 +82,7 @@ eos
is_expected.to contain_class('nova::wsgi::apache_metadata')
is_expected.to contain_class('nova::network::neutron')
is_expected.to contain_class('nova::metadata')
is_expected.to contain_class('nova::vendordata')
is_expected.to contain_class('tripleo::profile::base::apache')
}
end
@ -98,6 +101,7 @@ eos
is_expected.to contain_class('nova::wsgi::apache_metadata')
is_expected.to contain_class('nova::network::neutron')
is_expected.to contain_class('nova::metadata')
is_expected.to contain_class('nova::vendordata')
is_expected.to contain_class('tripleo::profile::base::apache')
}
end
@ -116,6 +120,7 @@ eos
is_expected.to contain_class('nova::wsgi::apache_metadata')
is_expected.to contain_class('nova::network::neutron')
is_expected.to contain_class('nova::metadata')
is_expected.to contain_class('nova::vendordata')
is_expected.to contain_class('tripleo::profile::base::apache')
}
end
@ -145,6 +150,7 @@ eos
:ssl_key => '/foo.key')
is_expected.to contain_class('nova::network::neutron')
is_expected.to contain_class('nova::metadata')
is_expected.to contain_class('nova::vendordata')
is_expected.to contain_class('tripleo::profile::base::apache')
}
end