diff --git a/elements/puppet-stack-config/puppet-stack-config.yaml.template b/elements/puppet-stack-config/puppet-stack-config.yaml.template
index 9a81790c8..d8d4011fb 100644
--- a/elements/puppet-stack-config/puppet-stack-config.yaml.template
+++ b/elements/puppet-stack-config/puppet-stack-config.yaml.template
@@ -227,6 +227,7 @@ tripleo::profile::base::database::mysql::mysql_server_options:
     bind-address: "%{hiera('controller_host')}"
     innodb_file_per_table: 'ON'
 mysql::server::restart: true
+mysql::server::root_password: {{UNDERCLOUD_DB_PASSWORD}}
 
 # Neutron
 neutron::bind_host: {{LOCAL_IP}}
diff --git a/instack_undercloud/undercloud.py b/instack_undercloud/undercloud.py
index e5421169e..6ff0018c4 100644
--- a/instack_undercloud/undercloud.py
+++ b/instack_undercloud/undercloud.py
@@ -356,7 +356,7 @@ _opts = [
 # Passwords, tokens, hashes
 _auth_opts = [
     cfg.StrOpt('undercloud_db_password',
-               help=('Password used for MySQL databases. '
+               help=('Password used for MySQL root user. '
                      'If left unset, one will be automatically generated.')
                ),
     cfg.StrOpt('undercloud_admin_token',
diff --git a/undercloud.conf.sample b/undercloud.conf.sample
index 0aa700adb..66b1980b6 100644
--- a/undercloud.conf.sample
+++ b/undercloud.conf.sample
@@ -206,7 +206,7 @@
 # From instack-undercloud
 #
 
-# Password used for MySQL databases. If left unset, one will be
+# Password used for MySQL root user. If left unset, one will be
 # automatically generated. (string value)
 #undercloud_db_password = <None>