starlingx
/
stx-puppet
Code Issues Proposed changes

Merge "Remove FM bootstrap"

This commit is contained in:
Zuul 2024-03-27 14:35:03 +00:00 committed by Gerrit Code Review
parent 19f82521fc 0c3df8e92f
commit 74af50a98b
3 changed files with 2 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
puppet-manifests/src/manifests/ansible_bootstrap.pp
View File

@ -30,4 +30,3 @@ include ::platform::drbd::dockerdistribution::bootstrap
include ::platform::filesystem::scratch
include ::platform::filesystem::backup
include ::platform::filesystem::kubelet
include ::platform::fm::bootstrap

6
puppet-manifests/src/modules/openstack/manifests/keystone.pp
View File

@ -304,8 +304,7 @@ class openstack::keystone::bootstrap(
include ::keystone::disable_admin_token_auth
$dc_required_classes = [ Class['::keystone::roles::admin'],
Class['::openstack::barbican::bootstrap'],
Class['::platform::sysinv::bootstrap'],
Class['::platform::fm::bootstrap']]
Class['::platform::sysinv::bootstrap'] ]
}
default: {
@ -326,8 +325,7 @@ class openstack::keystone::bootstrap(
}
$dc_required_classes = [ Class['::keystone::bootstrap'],
Class['::openstack::barbican::bootstrap'],
Class['::platform::sysinv::bootstrap'],
Class['::platform::fm::bootstrap']]
Class['::platform::sysinv::bootstrap'] ]
}
}

17
puppet-manifests/src/modules/platform/manifests/fm.pp
View File

@ -109,20 +109,3 @@ class platform::fm::runtime {
onlyif => 'pgrep fmManager'
}
}
class platform::fm::bootstrap {
# Set up needed config to enable launching of fmManager later
include ::platform::params
include ::platform::fm::params
include ::platform::fm::config
include ::fm::client
include ::fm::keystone::authtoken
include ::fm::db::postgresql
include ::fm::keystone::auth
class { '::fm::api':
host => $::platform::fm::params::api_host,
workers => $::platform::params::eng_workers,
sync_db => true,
}
}