Use new openstackclient tag
This looses dependency using the new openstackclient tag, which requires only packages actually related to openstack CLI. This also fixes the existing wrong tag (murano-package's' instead of murano-package). Depends-on: https://review.opendev.org/899594 Change-Id: I83483123e4d900112ba409c282d7607ed382e31c
This commit is contained in:
parent
b5b3082b18
commit
f74264b15c
@ -15,10 +15,12 @@ class murano::client(
|
|||||||
include murano::deps
|
include murano::deps
|
||||||
include murano::params
|
include murano::params
|
||||||
|
|
||||||
|
# NOTE(tkajinam): murano-package tag is used because muranoclient is required
|
||||||
|
# by murano
|
||||||
package { 'python-muranoclient':
|
package { 'python-muranoclient':
|
||||||
ensure => $package_ensure,
|
ensure => $package_ensure,
|
||||||
name => $::murano::params::pythonclient_package_name,
|
name => $::murano::params::pythonclient_package_name,
|
||||||
tag => ['openstack', 'murano-packages'],
|
tag => ['openstack', 'openstackclient', 'murano-package'],
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -76,7 +76,7 @@ class murano::dashboard(
|
|||||||
package { 'murano-dashboard':
|
package { 'murano-dashboard':
|
||||||
ensure => $package_ensure,
|
ensure => $package_ensure,
|
||||||
name => $::murano::params::dashboard_package_name,
|
name => $::murano::params::dashboard_package_name,
|
||||||
tag => ['openstack', 'murano-packages'],
|
tag => ['openstack', 'murano-package'],
|
||||||
}
|
}
|
||||||
|
|
||||||
concat { $::murano::params::local_settings_path: }
|
concat { $::murano::params::local_settings_path: }
|
||||||
|
@ -37,6 +37,15 @@ class murano::deps {
|
|||||||
-> Openstacklib::Policy<| tag == 'murano' |>
|
-> Openstacklib::Policy<| tag == 'murano' |>
|
||||||
-> Anchor['murano::config::end']
|
-> Anchor['murano::config::end']
|
||||||
|
|
||||||
|
# We need openstackclient installed before marking service end so that murano
|
||||||
|
# will have clients available to create resources. This tag handles the
|
||||||
|
# openstackclient but indirectly since the client is not available in
|
||||||
|
# all catalogs that don't need the client class (like many spec tests).
|
||||||
|
# Once the openstackclient is installed we will setup the datastores and
|
||||||
|
# datastore_versions. Datastore_versions must come after datastores.
|
||||||
|
Package<| tag == 'openstackclient'|>
|
||||||
|
-> Anchor['murano::service::end']
|
||||||
|
|
||||||
# Installation or config changes will always restart services.
|
# Installation or config changes will always restart services.
|
||||||
Anchor['murano::install::end'] ~> Anchor['murano::service::begin']
|
Anchor['murano::install::end'] ~> Anchor['murano::service::begin']
|
||||||
Anchor['murano::config::end'] ~> Anchor['murano::service::begin']
|
Anchor['murano::config::end'] ~> Anchor['murano::service::begin']
|
||||||
|
@ -11,7 +11,7 @@ describe 'murano::client' do
|
|||||||
is_expected.to contain_package('python-muranoclient').with(
|
is_expected.to contain_package('python-muranoclient').with(
|
||||||
:ensure => 'present',
|
:ensure => 'present',
|
||||||
:name => platform_params[:pythonclient_package_name],
|
:name => platform_params[:pythonclient_package_name],
|
||||||
:tag => ['openstack', 'murano-packages']
|
:tag => ['openstack', 'openstackclient', 'murano-package']
|
||||||
)
|
)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
Loading…
Reference in New Issue
Block a user