x
/
packstack
Code Issues Proposed changes

Remove deprecated params from templates 

auth_* parameters have been removed from puppet-neutron as of
https://review.openstack.org/301106, so they have to be removed
from Packstack as well.

puppet-heat has also removed deprecated parameters as of
https://review.openstack.org/308511.

puppet_glance changed the default value for some parameters as of
https://review.openstack.org/298893, which broke notifications.

Change-Id: Ic3e164aba64caa7620966a43437498f119130391
Note: this is Newton only.
This commit is contained in:
Javier Pena 2016-04-25 17:36:51 +02:00 committed by Javier Peña
parent 9b30d046de
commit 36361ee7cc
3 changed files with 11 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
packstack/puppet/templates/glance_ceilometer_rabbitmq.pp
View File

@ -12,12 +12,15 @@ if $kombu_ssl_keyfile {
}
}
class { '::glance::notify::rabbitmq':
rabbit_host => hiera('CONFIG_AMQP_HOST_URL'),
rabbit_port => hiera('CONFIG_AMQP_CLIENTS_PORT'),
rabbit_use_ssl => hiera('CONFIG_AMQP_SSL_ENABLED'),
rabbit_userid => hiera('CONFIG_AMQP_AUTH_USER'),
rabbit_password => hiera('CONFIG_AMQP_AUTH_PASSWORD'),
kombu_ssl_ca_certs => $kombu_ssl_ca_certs,
kombu_ssl_keyfile => $kombu_ssl_keyfile,
kombu_ssl_certfile => $kombu_ssl_certfile,
rabbit_host => hiera('CONFIG_AMQP_HOST_URL'),
rabbit_notification_exchange => 'glance',
rabbit_notification_topic => 'notifications',
rabbit_port => hiera('CONFIG_AMQP_CLIENTS_PORT'),
rabbit_use_ssl => hiera('CONFIG_AMQP_SSL_ENABLED'),
rabbit_userid => hiera('CONFIG_AMQP_AUTH_USER'),
rabbit_password => hiera('CONFIG_AMQP_AUTH_PASSWORD'),
kombu_ssl_ca_certs => $kombu_ssl_ca_certs,
kombu_ssl_keyfile => $kombu_ssl_keyfile,
kombu_ssl_certfile => $kombu_ssl_certfile,
notification_driver => 'messagingv2',
}

4
packstack/puppet/templates/heat.pp
View File

@ -18,10 +18,6 @@ keystone_user_role { "${keystone_admin}@admin":
}
class { '::heat::keystone::domain':
auth_url => hiera('CONFIG_KEYSTONE_PUBLIC_URL'),
keystone_admin => $keystone_admin,
keystone_password => hiera('CONFIG_KEYSTONE_ADMIN_PW'),
keystone_tenant => 'admin',
domain_name => hiera('CONFIG_HEAT_DOMAIN'),
domain_admin => hiera('CONFIG_HEAT_DOMAIN_ADMIN'),
domain_password => hiera('CONFIG_HEAT_DOMAIN_PASSWORD'),

3
packstack/puppet/templates/neutron_metadata.pp
View File

@ -1,7 +1,4 @@
class { '::neutron::agents::metadata':
auth_password => hiera('CONFIG_NEUTRON_KS_PW'),
auth_url => hiera('CONFIG_KEYSTONE_PUBLIC_URL'),
auth_region => hiera('CONFIG_KEYSTONE_REGION'),
shared_secret => hiera('CONFIG_NEUTRON_METADATA_PW'),
metadata_ip => force_ip(hiera('CONFIG_KEYSTONE_HOST_URL')),
debug => hiera('CONFIG_DEBUG_MODE'),