Merge "Update manifests to clean-up warnings"

This commit is contained in:
Jenkins 2016-02-29 19:55:07 +00:00 committed by Gerrit Code Review
commit ee8f138600
2 changed files with 5 additions and 6 deletions

View File

@ -32,10 +32,10 @@ class openstack_integration::ceilometer {
password => 'a_big_secret',
}
class { '::ceilometer::api':
enabled => true,
keystone_password => 'a_big_secret',
keystone_identity_uri => 'http://127.0.0.1:35357/',
service_name => 'httpd',
enabled => true,
keystone_password => 'a_big_secret',
identity_uri => 'http://127.0.0.1:35357/',
service_name => 'httpd',
}
class { '::ceilometer::wsgi::apache':
ssl => false,

View File

@ -33,8 +33,7 @@ class openstack_integration::neutron {
class { '::neutron::client': }
class { '::neutron::server':
database_connection => 'mysql+pymysql://neutron:neutron@127.0.0.1/neutron?charset=utf8',
auth_password => 'a_big_secret',
identity_uri => 'http://127.0.0.1:35357/',
password => 'a_big_secret',
sync_db => true,
api_workers => 2,
rpc_workers => 2,