Merge ~andreserl/maas:lp1809321_database_port_snap into maas:master

[Andres Rodriguez]

LP: #1809321 - Add --database-port as an optional option for the snap

[MAAS Lander (maas-lander)]

UNIT TESTS
-b lp1809321_database_port_snap lp:~andreserl/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: FAILED
LOG: http://maas-ci-jenkins.internal:8080/job/maas/job/branch-tester/5078/console
COMMIT: 137bef6f0ee61ab3f0f91cecb7a394695d13d4ca

review: Needs Fixing

[Blake Rouse (blake-rouse)]

Looks good!

review: Approve

[MAAS Lander (maas-lander)]

LANDING
-b lp1809321_database_port_snap lp:~andreserl/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: FAILED BUILD
LOG: http://maas-ci-jenkins.internal:8080/job/maas/job/branch-tester/5080/consoleText

[MAAS Lander (maas-lander)]

LANDING
-b lp1809321_database_port_snap lp:~andreserl/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: FAILED BUILD
LOG: http://maas-ci-jenkins.internal:8080/job/maas/job/branch-tester/5081/consoleText

[MAAS Lander (maas-lander)]

LANDING
-b lp1809321_database_port_snap lp:~andreserl/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: FAILED BUILD
LOG: http://maas-ci-jenkins.internal:8080/job/maas/job/branch-tester/5083/consoleText

[Andres Rodriguez (andreserl)]

review: Approve

[MAAS Lander (maas-lander)]

LANDING
-b lp1809321_database_port_snap lp:~andreserl/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: FAILED BUILD
LOG: http://maas-ci-jenkins.internal:8080/job/maas/job/branch-tester/5088/consoleText

[MAAS Lander (maas-lander)]

UNIT TESTS
-b lp1809321_database_port_snap lp:~andreserl/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: SUCCESS
COMMIT: ef7a64ce1533048f97029f17270b4d116f4aa702

review: Approve

diff --git a/src/maascli/snappy.py b/src/maascli/snappy.py
index 4779f0d..b381b5b 100755
--- a/src/maascli/snappy.py
+++ b/src/maascli/snappy.py
@@ -73,6 +73,12 @@ ARGUMENTS = OrderedDict([
             'the database. Only used when in \'region+rack\' or '
             '\'region\' mode.'),
     }),
+    ('database-port', {
+        'help': (
+            'Optional option to set the port that should be used to '
+            'communicate to the database. Only used when in '
+            '\'region+rack\' or \'region\' mode.'),
+    }),
     ('database-name', {
         'help': (
             'Database name for MAAS to use. Only used when in '
@@ -276,6 +282,7 @@ def print_config(
         print_config_value(config, 'maas_url')
         if current_mode in ['region+rack', 'region']:
             print_config_value(config, 'database_host')
+            print_config_value(config, 'database_port')
             print_config_value(config, 'database_name')
             print_config_value(config, 'database_user')
             print_config_value(
@@ -688,12 +695,20 @@ class cmd_init(SnappyCommand):
             perform_work('Stopping services', stop_services)
 
         # Configure the settings.
-        MAASConfiguration().update(
-            {'maas_url': maas_url,
-             'database_host': database_host,
-             'database_name': database_name,
-             'database_user': database_user,
-             'database_pass': database_pass})
+        settings = {
+            'maas_url': maas_url,
+            'database_host': database_host,
+            'database_name': database_name,
+            'database_user': database_user,
+            'database_pass': database_pass}
+
+        # Add the port to the configuration if exists. By default
+        # MAAS handles picking the port automatically in the backend
+        # if none provided.
+        if options.database_port:
+            settings['database_port'] = options.database_port
+
+        MAASConfiguration().update(settings)
         set_rpc_secret(rpc_secret)
 
         # Finalize the Initialization.