Skip to content

Add parameter to not create additional users on cloudstack-setup-databases #9969

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
Open

Add parameter to not create additional users on cloudstack-setup-databases #9969

Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f06f5a8
Add parameter to not create additional users on cloudstack-setup-data…
Nov 18, 2024
ce658e5
apply dahn's suggestion
lucas-a-martins Nov 28, 2024
42c6e7a
Fix --skip-users-auto-creation flag
Feb 13, 2025
09ec0a9
Change to not remove IF and END IF
Mar 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 19 additions & 0 deletions setup/bindir/cloud-setup-databases.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,7 @@ class DBDeployer(object):
magicString = 'This_is_a_magic_string_i_think_no_one_will_duplicate'
tmpMysqlFile = os.path.join(os.path.expanduser('~/'), 'cloudstackmysql.tmp.sql')
mysqlBinPath = None
skipUsersAutoCreation = False

def preRun(self):
def backUpDbDotProperties():
Expand Down Expand Up @@ -219,6 +220,17 @@ for full help
""),
)

queriesToSkip = (
"CREATE USER cloud@`localhost` identified by 'cloud';",
"CREATE USER cloud@`%` identified by 'cloud';",
"GRANT ALL ON cloud.* to cloud@`localhost`;",
"GRANT ALL ON cloud.* to cloud@`%`;",
"GRANT ALL ON cloud_usage.* to cloud@`localhost`;",
"GRANT ALL ON cloud_usage.* to cloud@`%`;",
"GRANT process ON *.* TO cloud@`localhost`;",
"GRANT process ON *.* TO cloud@`%`;",
)

scriptsToRun = ["create-database","create-schema", "create-database-premium","create-schema-premium"]
if self.options.schemaonly:
scriptsToRun = ["create-schema", "create-schema-premium"]
Expand All @@ -227,6 +239,8 @@ for full help
p = os.path.join(self.dbFilesPath,"%s.sql"%f)
if not os.path.exists(p): continue
text = open(p).read()
if self.options.skipUsersAutoCreation:
for t in queriesToSkip: text = text.replace(t,"")
for t, r in replacements: text = text.replace(t,r)
self.info("Applying %s"%p)
self.runMysql(text, p, self.rootuser != None)
Expand Down Expand Up @@ -470,6 +484,8 @@ for example:
self.encryptionJarPath = self.options.encryptionJarPath
if self.options.mysqlbinpath:
self.mysqlBinPath = self.options.mysqlbinpath
if self.options.skipUsersAutoCreation:
self.skipUsersAutoCreation = self.options.skipUsersAutoCreation
Comment on lines +489 to +490
Copy link
Preview

Copilot AI Jun 5, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

[nitpick] The flag is checked in multiple locations; consider consolidating the handling of skipUsersAutoCreation to ensure consistency and reduce potential duplication of logic.

Suggested change
if self.options.skipUsersAutoCreation:
self.skipUsersAutoCreation = self.options.skipUsersAutoCreation
self.handleSkipUsersAutoCreation()

Copilot uses AI. Check for mistakes.


if self.options.encryptorVersion:
self.encryptorVersion = "--encryptorversion %s" % self.options.encryptorVersion
Expand Down Expand Up @@ -610,6 +626,9 @@ for example:
self.parser.add_option("-g", "--encryptor-version", action="store", dest="encryptorVersion", default="V2",
help="The encryptor version to be used to encrypt the values in db.properties")
self.parser.add_option("-b", "--mysql-bin-path", action="store", dest="mysqlbinpath", help="The mysql installed bin path")
self.parser.add_option("-u", "--skip-users-auto-creation", action="store_true", dest="skipUsersAutoCreation",
help="Indicates whether to skip the auto-creation of users in the database. Use this flag when your database users " \
"are already configured and you only want to populate the db.properties file.")
(self.options, self.args) = self.parser.parse_args()
parseCasualCredit()
parseOtherOptions()
Expand Down
Loading