Merge lp:~allenap/maas/packaging.fix-cluster-installation into lp:~maas-maintainers/maas/packaging

[Gavin Panella]

Ensures that regiond.conf and clusterd.conf are both initialised after package installation.

maas-clusterd will also be restarted if the shared secret is missing. Previously it would never be started.

This builds on Andres's work in lp:~andreserl/maas/fix_cluster_install_1.9, and supersedes that branch.

[Andres Rodriguez (andreserl)]

comments inline.

review: Needs Fixing

[lp:~allenap/maas/packaging.fix-cluster-installation]

418. By Gavin Panella on 2015-07-10

Remove superfluous creation of an empty configuration file.

419. By Gavin Panella on 2015-07-10

Improve comments about unconditionally creating configuration files.

[Gavin Panella (allenap)]

Thanks for the review! Answers in the diff.

[Andres Rodriguez (andreserl)]

Comments inline. Please address the validation of regiond.conf and clusterd.conf existance. We should not be running *any* type of code unless otherwise necessary.

review: Approve

[lp:~allenap/maas/packaging.fix-cluster-installation]

420. By Gavin Panella on 2015-07-13

Delay for 10s between unattended restarts of maas-regiond.

421. By Gavin Panella on 2015-07-13

Merge trunk.

[Gavin Panella (allenap)]

Thanks for the review! Replies inline. I'm not landing this until I can get a clear run in the manual CI so I imagine you have some time if you want to make more comments :)

=== modified file 'debian/maas-cluster-controller.config'
--- debian/maas-cluster-controller.config	2015-06-23 12:30:50 +0000
+++ debian/maas-cluster-controller.config	2015-07-13 18:13:40 +0000
@@ -12,7 +12,7 @@
     db_get maas-cluster-controller/maas-url || true
     if [ -z "$RET" ]; then
         # Attempt to pre-populate if installing on the region controller.
-        if [ -e /etc/maas/regiond.conf ]; then
+        if [ -f /usr/sbin/maas-region-admin ]; then
             url=$(maas-region-admin local_config_get --maas-url --plain)
             # If the URL doesn't end in /MAAS then add it. This helps upgrades from
             # precise for which the URL didn't contain /MAAS, which is now required
 
=== modified file 'debian/maas-cluster-controller.maas-clusterd.service'
--- debian/maas-cluster-controller.maas-clusterd.service	2015-06-29 16:38:41 +0000
+++ debian/maas-cluster-controller.maas-clusterd.service	2015-07-13 18:13:40 +0000
@@ -3,12 +3,12 @@
 Documentation=https://maas.ubuntu.com/
 Requires=network-online.target
 After=network-online.target
-ConditionPathExists=/var/lib/maas/secret
 
 [Service]
 User=maas
 Group=maas
 Restart=always
+RestartSec=10s
 Environment="LOGFILE=/var/log/maas/clusterd.log"
 # Logs go to the journal; read them with
 #   journalctl -u maas-clusterd
 
=== modified file 'debian/maas-cluster-controller.postinst'
--- debian/maas-cluster-controller.postinst	2015-07-03 02:33:20 +0000
+++ debian/maas-cluster-controller.postinst	2015-07-13 18:13:40 +0000
@@ -79,6 +79,10 @@
     fi
 }
 
+# Unconditionally ensure that there is at least an empty configuration
+# file. This does *not* overwrite any existing configuration.
+maas-provision config
+
 if [ "$1" = "configure" ] && [ -z "$2" ]; then
     create_log_dir
     create_var_dir
 
=== modified file 'debian/maas-region-controller-min.maas-regiond-worker@.service'
--- debian/maas-region-controller-min.maas-regiond-worker@.service	2015-06-24 21:23:05 +0000
+++ debian/maas-region-controller-min.maas-regiond-worker@.service	2015-07-13 18:13:40 +0000
@@ -13,6 +13,7 @@
 User=maas
 Group=maas
 Restart=always
+RestartSec=10s
 Environment="DJANGO_SETTINGS_MODULE=maas.settings"
 Environment="PYTHONPATH=/usr/share/maas:/usr/lib/django16"
 Environment="LOGFILE=/var/log/maas/regiond.log"
 
=== modified file 'debian/maas-region-controller-min.postinst'
--- debian/maas-region-controller-min.postinst	2015-07-03 13:57:50 +0000
+++ debian/maas-region-controller-min.postinst	2015-07-13 18:13:40 +0000
@@ -38,6 +38,10 @@
     ln -sf /var/log/apache2 /var/log/maas/
 }
 
+# Unconditionally ensure that there is at least an empty configuration
+# file. This does *not* overwrite any existing configuration.
+maas-region-admin local_config_set
+
 if [ "$1" = "configure" ] && [ -z "$2" ]; then
     #########################################################
     ################ Folder Permissions  ####################