Do not create heat_stack_owner role in keystone.pp

It's created in heat::keystone::auth and after [1] it's complaining of
duplicate declaration.

Also pinning gettext as version 3.3.0 is not compatible with the ruby
version in CentOS7.

[1] https://review.opendev.org/#/c/692664

Change-Id: I8d226aa2218eafc07119f88eca5be24c3514b717
This commit is contained in:
Alfredo Moralejo 2020-01-08 12:11:06 +01:00
parent a344b9cd36
commit c86f30c1dd
2 changed files with 2 additions and 1 deletions

View File

@ -50,7 +50,7 @@ class packstack::keystone ()
}
if hiera('CONFIG_HEAT_INSTALL') == 'y' {
$keystone_admin_roles = ['admin', '_member_', 'heat_stack_owner']
$keystone_admin_roles = ['admin', '_member_']
} else {
$keystone_admin_roles = ['admin']
}

View File

@ -283,6 +283,7 @@ if [ "${INSTALL_FROM_SOURCE}" = true ]; then
fi
export PUPPETFILE_DIR=/usr/share/openstack-puppet/modules
export GEM_HOME=/tmp/packstackgems
$SUDO gem install gettext -v 3.2.9 --no-ri --no-rdoc
$SUDO gem install r10k -v 2.6.4 --no-ri --no-rdoc
# make sure there is no puppet module pre-installed
$SUDO rm -rf "${PUPPETFILE_DIR:?}/"*