openstack
/
instack-undercloud
Code Issues Proposed changes

Remove usage of os-cloud-config 

Since we don't need os-cloud-config anymore to perform the Keystone
resources management, let's remove the workaround we had to handle back
in Mitaka and before.

Also remove the installation of os-cloud-config.

Change-Id: I0bf8c17aabf646e5206f579cd20e3910aae61da3
Related-Bug: #1677008
This commit is contained in:
Emilien Macchi 2017-03-28 18:06:41 -04:00
parent 57b86aab39
commit 2b9bddf8f1
2 changed files with 0 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
elements/puppet-stack-config/package-installs.yaml
View File

@ -1,3 +1,2 @@
os-cloud-config:
pystache:
python-oslo-concurrency:

7
elements/puppet-stack-config/puppet-stack-config.pp
View File

@ -347,12 +347,6 @@ include ::swift::keystone::auth
include ::ironic::keystone::auth
include ::ironic::keystone::auth_inspector
# Because os-cloud-config/tree/os_cloud_config/keystone.py already managed
# it but with a different service name than Puppet will do (novav3), we want Puppet
# to making sure computev3 is not here anymore and we will add novav3 later.
keystone_service { 'nova::computev3': ensure => absent }
Keystone_service<||> -> Keystone_endpoint<||>
#TODO: need a cleanup-keystone-tokens.sh solution here
keystone_config {
'ec2/driver': value => 'keystone.contrib.ec2.backends.sql.Ec2';
@ -636,7 +630,6 @@ ensure_resource('package', 'python-proliantutils')
ensure_resource('package', 'firewalld', {
'ensure' => 'purged',
})
ensure_resource('package', 'os-cloud-config')
ensure_resource('package', 'openstack-selinux')
ensure_resource('package', 'syslinux-extlinux')
ensure_resource('package', 'tftp-server')