starlingx
/
stx-puppet
Code Issues Proposed changes

Remove Barbican bootstrap class 

This commit removes the Barbican bootstrap class from puppet.

Test Plan:
1. PASS: Verify full DC system deployment (System Controller + 3
         Subclouds) install/bootstrap (virtual lab)
2. PASS: Verify Barbican database/user setup
3. PASS: Verify Openstack user, service and endpoint configuration

Depends-on: https://review.opendev.org/c/starlingx/config/+/913587
Depends-on: https://review.opendev.org/c/starlingx/ansible-playbooks/+/913589

Story: 2011035
Task: 49739

Change-Id: I31840be36f69a8dd8cb2592195a407907399779f
Signed-off-by: Hugo Brito <hugo.brito@windriver.com>
This commit is contained in:
Hugo Brito 2024-03-18 14:37:13 -03:00 committed by Hugo Nicodemos
parent 74af50a98b
commit 01729f91ae
3 changed files with 0 additions and 34 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

@ -16,7 +16,6 @@ include ::platform::postgresql::bootstrap
include ::platform::amqp::bootstrap
include ::openstack::keystone::bootstrap
include ::openstack::barbican::bootstrap
include ::platform::client::bootstrap
include ::platform::sysinv::bootstrap

31
puppet-manifests/src/modules/openstack/manifests/barbican.pp
View File

@ -214,37 +214,6 @@ class openstack::barbican::api
include ::openstack::barbican::haproxy
}
class openstack::barbican::bootstrap
inherits ::openstack::barbican::params {
class { '::barbican::keystone::auth':
configure_user_role => false,
}
class { '::barbican::keystone::authtoken':
auth_url => 'http://localhost:5000',
project_name => 'services',
user_domain_name => 'Default',
project_domain_name => 'Default',
}
$bu_name = $::barbican::keystone::auth::auth_name
$bu_tenant = $::barbican::keystone::auth::tenant
keystone_role { 'creator':
ensure => present,
}
keystone_user_role { "${bu_name}@${bu_tenant}":
ensure => present,
roles => ['admin', 'creator'],
}
include ::barbican::db::postgresql
include ::openstack::barbican
class { '::openstack::barbican::service':
service_enabled => true,
}
}
class openstack::barbican::runtime
inherits ::openstack::barbican::params {

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

@ -303,7 +303,6 @@ class openstack::keystone::bootstrap(
# disabling the admin token per openstack recommendation
include ::keystone::disable_admin_token_auth
$dc_required_classes = [ Class['::keystone::roles::admin'],
Class['::openstack::barbican::bootstrap'],
Class['::platform::sysinv::bootstrap'] ]
}
@ -324,7 +323,6 @@ class openstack::keystone::bootstrap(
password => lookup('keystone::roles::admin::password'),
}
$dc_required_classes = [ Class['::keystone::bootstrap'],
Class['::openstack::barbican::bootstrap'],
Class['::platform::sysinv::bootstrap'] ]
}
}