Skip to content

Commit

Permalink
Merge pull request #756 from jeanleonov/fdb-clusterfile-property
Browse files Browse the repository at this point in the history
Add fdb_clusterfile_content property to AppScalefile
  • Loading branch information
cdonati authored Aug 14, 2019
2 parents edcbfc6 + 6d7c608 commit 2210e42
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 1 deletion.
3 changes: 2 additions & 1 deletion appscale/tools/local_state.py
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,8 @@ def generate_deployment_params(cls, options, node_layout, additional_creds):
"user_commands": json.dumps(options.user_commands),
"verbose": str(options.verbose),
"flower_password": options.flower_password,
"default_max_appserver_memory": str(options.default_max_appserver_memory)
"default_max_appserver_memory": str(options.default_max_appserver_memory),
"fdb_clusterfile_content": options.fdb_clusterfile_content
}
creds.update(additional_creds)

Expand Down
2 changes: 2 additions & 0 deletions appscale/tools/parse_args.py
Original file line number Diff line number Diff line change
Expand Up @@ -314,6 +314,8 @@ def add_allowed_flags(self, function):
self.parser.add_argument('--user_commands',
help="a base64-encoded YAML dictating the commands to run before " +
"starting each AppController")
self.parser.add_argument('--fdb_clusterfile_content',
help="a string representing content of FoundationDB clusterfile")
elif function == "appscale-gather-logs":
self.parser.add_argument('--keyname', '-k', default=self.DEFAULT_KEYNAME,
help="the keypair name to use")
Expand Down

0 comments on commit 2210e42

Please sign in to comment.