Skip to content

Commit

Permalink
Partail-Bug: #1567022
Browse files Browse the repository at this point in the history
Server Manager: Security

Auto-generate all passwords and token when not mentioned.

Testing:
Provisioned a multinode ha kilo setup with old and new params.

Change-Id: Ibca5504173f264ea5248402db2100e28ff1a7e44
  • Loading branch information
thilakrajs committed Apr 6, 2016
1 parent 0e2bbb5 commit 9486b9b
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions contrail/environment/modules/contrail/manifests/init.pp
Original file line number Diff line number Diff line change
Expand Up @@ -759,7 +759,7 @@
openstack_user_list => hiera(openstack::openstack_user_list, hiera(contrail::params::openstack_user_list, $openstack_user_list)),
openstack_mgmt_ip_list => hiera(openstack::openstack_mgmt_ip_list, hiera(contrail::params::openstack_mgmt_ip_list, $openstack_mgmt_ip_list)),
keystone_ip => hiera(openstack::keystone_ip, hiera(contrail::params::keystone_ip, $keystone_ip)),
keystone_admin_password => hiera(openstack::keystone_admin_password, hiera(contrail::params::keystone_admin_password, $keystone_admin_password)),
keystone_admin_password => hiera(openstack::keystone::admin_password, hiera(contrail::params::keystone_admin_password, $keystone_admin_password)),
keystone_admin_user => hiera(openstack::keystone_admin_user, hiera(contrail::params::keystone_admin_user, $keystone_admin_user)),
keystone_admin_tenant => hiera(openstack::keystone_admin_tenant, hiera(contrail::params::keystone_admin_tenant, $keystone_admin_tenant)),
keystone_service_tenant => hiera(openstack::keystone_service_tenant, hiera(contrail::params::keystone_service_tenant, $keystone_service_tenant)),
Expand All @@ -773,7 +773,7 @@
keystone_insecure_flag => hiera(openstack::keystone_insecure_flag, hiera(contrail::params::keystone_insecure_flag, $keystone_insecure_flag)),
amqp_server_ip => hiera(openstack::amqp_server_ip, hiera(contrail::params::amqp_server_ip, $amqp_server_ip)),
openstack_manage_amqp => hiera(openstack::openstack_manage_amqp, hiera(contrail::params::openstack_manage_amqp, $openstack_manage_amqp)),
mysql_root_password => hiera(openstack::mysql_root_password, hiera(contrail::params::mysql_root_password, $mysql_root_password)),
mysql_root_password => hiera(openstack::mysql::root_password, hiera(contrail::params::mysql_root_password, $mysql_root_password)),
metadata_secret => hiera(openstack::metadata_secret, hiera(contrail::params::metadata_secret, $metadata_secret)),
enable_ceilometer => hiera(openstack::enable_ceilometer, hiera(contrail::params::enable_ceilometer, $enable_ceilometer)),
contrail_amqp_ip_list => hiera(openstack::contrail_amqp_ip_list, hiera(contrail::params::contrail_amqp_ip_list, $contrail_amqp_ip_list)),
Expand Down
2 changes: 1 addition & 1 deletion contrail/environment/modules/mysql/manifests/server.pp
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
$package_ensure = $mysql::params::server_package_ensure,
$package_name = $mysql::params::server_package_name,
$purge_conf_dir = $mysql::params::purge_conf_dir,
$remove_default_accounts = false,
$remove_default_accounts = true,
# $restart = $mysql::params::restart,
$restart = false,
$root_group = $mysql::params::root_group,
Expand Down

0 comments on commit 9486b9b

Please sign in to comment.