From 9bf5e54f5c95dc5b610ebba9958c6f3ae1f77a13 Mon Sep 17 00:00:00 2001 From: Emilien Macchi Date: Sun, 1 Feb 2015 19:32:26 -0500 Subject: [PATCH] Drop deprecated parameters Some parameters are deprecated and have no effect in upstream modules. Change-Id: I1dfb2951abff72b093b06a57436ca9e9315a62b2 --- manifests/dashboard.pp | 2 -- manifests/database/sql/mysql.pp | 7 ------- manifests/identity.pp | 3 +-- spec/classes/cloud_dashboard_spec.rb | 4 ---- spec/classes/cloud_database_sql_mysql_spec.rb | 7 ------- spec/classes/cloud_identity_spec.rb | 3 +-- 6 files changed, 2 insertions(+), 24 deletions(-) diff --git a/manifests/dashboard.pp b/manifests/dashboard.pp index d455f786..79cb31c0 100644 --- a/manifests/dashboard.pp +++ b/manifests/dashboard.pp @@ -153,10 +153,8 @@ class cloud::dashboard( class { 'horizon': secret_key => $secret_key, - can_set_mount_point => 'False', servername => $servername, bind_address => $api_eth, - swift => true, keystone_url => $keystone_url, cache_server_ip => false, django_debug => $debug, diff --git a/manifests/database/sql/mysql.pp b/manifests/database/sql/mysql.pp index f5a68d11..4818e9dd 100644 --- a/manifests/database/sql/mysql.pp +++ b/manifests/database/sql/mysql.pp @@ -226,7 +226,6 @@ class cloud::database::sql::mysql ( # OpenStack DB class { 'keystone::db::mysql': - mysql_module => '2.2', dbname => 'keystone', user => $keystone_db_user, password => $keystone_db_password, @@ -234,7 +233,6 @@ class cloud::database::sql::mysql ( allowed_hosts => $keystone_db_allowed_hosts, } class { 'glance::db::mysql': - mysql_module => '2.2', dbname => 'glance', user => $glance_db_user, password => $glance_db_password, @@ -242,7 +240,6 @@ class cloud::database::sql::mysql ( allowed_hosts => $glance_db_allowed_hosts, } class { 'nova::db::mysql': - mysql_module => '2.2', dbname => 'nova', user => $nova_db_user, password => $nova_db_password, @@ -250,7 +247,6 @@ class cloud::database::sql::mysql ( allowed_hosts => $nova_db_allowed_hosts, } class { 'cinder::db::mysql': - mysql_module => '2.2', dbname => 'cinder', user => $cinder_db_user, password => $cinder_db_password, @@ -258,7 +254,6 @@ class cloud::database::sql::mysql ( allowed_hosts => $cinder_db_allowed_hosts, } class { 'neutron::db::mysql': - mysql_module => '2.2', dbname => 'neutron', user => $neutron_db_user, password => $neutron_db_password, @@ -266,7 +261,6 @@ class cloud::database::sql::mysql ( allowed_hosts => $neutron_db_allowed_hosts, } class { 'heat::db::mysql': - mysql_module => '2.2', dbname => 'heat', user => $heat_db_user, password => $heat_db_password, @@ -274,7 +268,6 @@ class cloud::database::sql::mysql ( allowed_hosts => $heat_db_allowed_hosts, } class { 'trove::db::mysql': - mysql_module => '2.2', dbname => 'trove', user => $trove_db_user, password => $trove_db_password, diff --git a/manifests/identity.pp b/manifests/identity.pp index 43ae000e..40d41965 100644 --- a/manifests/identity.pp +++ b/manifests/identity.pp @@ -542,7 +542,7 @@ class cloud::identity ( token_provider => 'keystone.token.providers.uuid.Provider', use_syslog => $use_syslog, verbose => $verbose, - bind_host => $api_eth, + public_bind_host => $api_eth, log_dir => $log_dir, log_file => $log_file, public_port => $ks_keystone_public_port, @@ -617,7 +617,6 @@ class cloud::identity ( } class { 'nova::keystone::auth': - cinder => true, admin_address => $ks_nova_admin_host, internal_address => $ks_nova_internal_host, public_address => $ks_nova_public_host, diff --git a/spec/classes/cloud_dashboard_spec.rb b/spec/classes/cloud_dashboard_spec.rb index f8bbf725..7056c77a 100644 --- a/spec/classes/cloud_dashboard_spec.rb +++ b/spec/classes/cloud_dashboard_spec.rb @@ -42,10 +42,8 @@ describe 'cloud::dashboard' do is_expected.to contain_class('horizon').with( :listen_ssl => false, :secret_key => '/etc/ssl/secret', - :can_set_mount_point => 'False', :bind_address => '10.0.0.1', :servername => 'horizon.openstack.org', - :swift => true, :cache_server_ip => false, :keystone_url => 'http://keystone.openstack.org:5000/v2.0', :django_debug => true, @@ -106,10 +104,8 @@ describe 'cloud::dashboard' do is_expected.to contain_class('horizon').with( :listen_ssl => false, :secret_key => '/etc/ssl/secret', - :can_set_mount_point => 'False', :bind_address => '10.0.0.1', :servername => 'horizon.openstack.org', - :swift => true, :cache_server_ip => false, :keystone_url => 'http://keystone.openstack.org:5000/v2.0', :django_debug => true, diff --git a/spec/classes/cloud_database_sql_mysql_spec.rb b/spec/classes/cloud_database_sql_mysql_spec.rb index 1ba9942e..6d5d0c18 100644 --- a/spec/classes/cloud_database_sql_mysql_spec.rb +++ b/spec/classes/cloud_database_sql_mysql_spec.rb @@ -111,7 +111,6 @@ describe 'cloud::database::sql::mysql' do it 'configure keystone database' do is_expected.to contain_class('keystone::db::mysql').with( - :mysql_module => '2.2', :dbname => 'keystone', :user => 'keystone', :password => 'secrete', @@ -121,7 +120,6 @@ describe 'cloud::database::sql::mysql' do it 'configure glance database' do is_expected.to contain_class('glance::db::mysql').with( - :mysql_module => '2.2', :dbname => 'glance', :user => 'glance', :password => 'secrete', @@ -131,7 +129,6 @@ describe 'cloud::database::sql::mysql' do it 'configure nova database' do is_expected.to contain_class('nova::db::mysql').with( - :mysql_module => '2.2', :dbname => 'nova', :user => 'nova', :password => 'secrete', @@ -141,7 +138,6 @@ describe 'cloud::database::sql::mysql' do it 'configure cinder database' do is_expected.to contain_class('cinder::db::mysql').with( - :mysql_module => '2.2', :dbname => 'cinder', :user => 'cinder', :password => 'secrete', @@ -151,7 +147,6 @@ describe 'cloud::database::sql::mysql' do it 'configure neutron database' do is_expected.to contain_class('neutron::db::mysql').with( - :mysql_module => '2.2', :dbname => 'neutron', :user => 'neutron', :password => 'secrete', @@ -161,7 +156,6 @@ describe 'cloud::database::sql::mysql' do it 'configure heat database' do is_expected.to contain_class('heat::db::mysql').with( - :mysql_module => '2.2', :dbname => 'heat', :user => 'heat', :password => 'secrete', @@ -171,7 +165,6 @@ describe 'cloud::database::sql::mysql' do it 'configure trove database' do is_expected.to contain_class('trove::db::mysql').with( - :mysql_module => '2.2', :dbname => 'trove', :user => 'trove', :password => 'secrete', diff --git a/spec/classes/cloud_identity_spec.rb b/spec/classes/cloud_identity_spec.rb index 1353a57a..bbaca890 100644 --- a/spec/classes/cloud_identity_spec.rb +++ b/spec/classes/cloud_identity_spec.rb @@ -130,7 +130,7 @@ describe 'cloud::identity' do :token_driver => 'keystone.token.persistence.backends.sql.Token', :token_provider => 'keystone.token.providers.uuid.Provider', :use_syslog => true, - :bind_host => '10.0.0.1', + :public_bind_host => '10.0.0.1', :public_port => '5000', :admin_port => '35357', :token_expiration => '3600', @@ -221,7 +221,6 @@ describe 'cloud::identity' do it 'configure nova endpoints' do is_expected.to contain_class('nova::keystone::auth').with( :admin_address => '10.0.0.1', - :cinder => true, :internal_address => '10.0.0.1', :password => 'secrete', :public_address => '10.0.0.1',