Merge lp:~allenap/maas/packaging.kill-all-the-configs-cluster into lp:~maas-maintainers/maas/packaging

[Gavin Panella]

Use new local configuration support for the cluster.

This follows on from lp:~andreserl/maas/packaging_clusterd_conf.

[Andres Rodriguez (andreserl)]

Hi Gavin,

I tested this and overall it looks good:

1. Fresh install worked just fine.
2. Upgrade seemed to go ok, but it seems that it didn't migrate the config as expected. However, I think we can still merge this and look for other corner cases as I have not tested every single possible scenario and I'm thinking of making some packaging changes.

That being said, I think we can land and keep improving.

review: Approve

[Andres Rodriguez (andreserl)]

Also, don't forget to add changelog entries please and I have one comment inline.

[Andres Rodriguez (andreserl)]

Gavin,

I made some improvements to your branch. You can just land this one and I'll follow up with:

https://code.launchpad.net/~andreserl/maas/improve_packaging_regiond_clusterd/+merge/263607

review: Approve

[Gavin Panella (allenap)]

> Gavin,
>
> I made some improvements to your branch. You can just land this one and
> I'll follow up with:
>
> https://code.launchpad.net/~andreserl/maas/improve_packaging_regiond_clusterd/+merge/263607

Thanks!

Do I need to do anything in this branch? It looks like I need to update
the changelog. There's also your inline comment about upgrades from <=
1.8: does your branch take care of that or should I fix it?

[MAAS Lander (maas-lander)]

There are additional revisions which have not been approved in review. Please seek review and approval of these new revisions.

=== modified file 'debian/changelog'
--- debian/changelog	2015-06-26 11:49:32 +0000
+++ debian/changelog	2015-07-02 16:28:13 +0000
@@ -5,6 +5,9 @@
   [ Raphaël Badin ]
   * Enable proxy_wstunnel module.
 
+  [ Gavin Panella ]
+  * Use new local configuration support for the cluster.
+
  -- Andres Rodriguez <[e-mail]>  Fri, 12 Jun 2015 14:16:47 -0400
 
 maas (1.8.0+bzr4001-0ubuntu1) trusty; urgency=medium

=== modified file 'debian/maas-cluster-controller.install'
--- debian/maas-cluster-controller.install	2015-03-25 16:35:38 +0000
+++ debian/maas-cluster-controller.install	2015-07-02 16:28:13 +0000
@@ -1,12 +1,6 @@
 # Install twisted plugins
 twisted/plugins/maasclusterd.py usr/share/pyshared/twisted/plugins
 
-# Install PSERV config file
-debian/tmp/etc/maas/pserv.yaml
-
-# Install cluster config file
-debian/tmp/etc/maas/maas_cluster.conf
-
 # Install templates
 debian/tmp/etc/maas/templates/dhcp
 debian/tmp/etc/maas/templates/power

=== modified file 'debian/maas-cluster-controller.maas-clusterd.service'
--- debian/maas-cluster-controller.maas-clusterd.service	2015-05-21 16:54:25 +0000
+++ debian/maas-cluster-controller.maas-clusterd.service	2015-07-02 16:28:13 +0000
@@ -4,15 +4,11 @@
 Requires=network-online.target
 After=network-online.target
 ConditionPathExists=/var/lib/maas/secret
-# These will go away one we support new config files.
-ConditionPathExists=/etc/maas/maas_cluster.conf
-ConditionPathExists=/etc/maas/pserv.yaml
 
 [Service]
 User=maas
 Group=maas
 Restart=always
-EnvironmentFile=/etc/maas/maas_cluster.conf
 Environment="LOGFILE=/var/log/maas/clusterd.log"
 # Logs go to the journal; read them with
 #   journalctl -u maas-clusterd
@@ -20,7 +16,7 @@
 # should now be preferred as the $LOGFILE will be removed in MAAS 1.9.
 ExecStart=/bin/sh -c \
     'exec /usr/bin/authbind --deep /usr/bin/twistd --nodaemon --pidfile= \
-     maas-clusterd --config-file=/etc/maas/pserv.yaml 2>&1 | tee -a $LOGFILE'
+     maas-clusterd 2>&1 | tee -a $LOGFILE'
 
 [Install]
 WantedBy=multi-user.target

=== modified file 'debian/maas-cluster-controller.maas-clusterd.upstart'
--- debian/maas-cluster-controller.maas-clusterd.upstart	2015-01-23 14:56:56 +0000
+++ debian/maas-cluster-controller.maas-clusterd.upstart	2015-07-02 16:28:13 +0000
@@ -6,28 +6,13 @@
 
 respawn
 
-env CONFIG_FILE=/etc/maas/maas_cluster.conf
 env LOGFILE=/var/log/maas/clusterd.log
 
-pre-start script
-    if [ ! -f $CONFIG_FILE ]; then
-        echo "$CONFIG_FILE does not exist.  Aborting."
-        stop
-        exit 0
-    fi
-end script
-
 script
     # Exit immediately on error, and treat unset variables as errors. In
     # sh/dash, unfortunately, the following does not cause the use of an unset
     # variable to halt the script, it merely prints an error and sets $?.
     set -o errexit -o nounset
-    # Load the configuration file.
-    . $CONFIG_FILE
-    # The MAAS cluster controller needs both CLUSTER_UUID and MAAS_URL to
-    # operate.
-    export CLUSTER_UUID
-    export MAAS_URL
     # Check for the shared-secret. If it's not here, sleep for a while, then
     # exit and allow respawn to do its thing.
     if ! maas-provision check-for-shared-secret >/dev/null; then
@@ -48,5 +33,5 @@
     # To add options to your daemon, edit the line below:
     exec /usr/bin/authbind --deep \
         /usr/bin/twistd --nodaemon --uid=maas --gid=maas --pidfile= \
-        maas-clusterd --config-file=/etc/maas/pserv.yaml > ${LOGFILE} 2>&1
+        maas-clusterd > ${LOGFILE} 2>&1
 end script

=== modified file 'debian/maas-cluster-controller.postinst'
--- debian/maas-cluster-controller.postinst	2015-05-21 16:55:24 +0000
+++ debian/maas-cluster-controller.postinst	2015-07-02 16:28:13 +0000
@@ -32,35 +32,14 @@
 }
 
 extract_cluster_uuid(){
-    # Extract ClUSTER_UUID setting from config file $1.  This will work
-    # the cluster config (which is shell).
-    sed -n -e "s/^CLUSTER_UUID *= *[\"']\([^\"']*\).*/\1/p" "$1"
+    # Extract ClUSTER_UUID setting from config file $1. This will work
+    # on the old the cluster config file (which is shell).
+    awk '{ split($1,array,"\"")} END{print array[2] }' "$1"
 }
 
 configure_cluster_uuid(){
-    # The cluster uuid goes into maas_cluster.conf.  If an old uuid is
-    # configured, we replicate that to maas_cluster.conf; otherwise,
-    # we want to generate one.
-    local uuid
-
-    if [ -n "$(extract_cluster_uuid /etc/maas/maas_cluster.conf)" ]; then
-        # UUID is already set up.  Wonderful.
-        return
-    else
-        # No UUID at all yet.  Generate one.
-        uuid="$(uuidgen)"
-    fi
-
-    # Write the uuid to maas_cluster.conf
-    # There is no initial placeholder in this file, so just append the setting.
-    echo "CLUSTER_UUID=\"$uuid\"" >>/etc/maas/maas_cluster.conf
-}
-
-enable_apache_version_mod(){
-    COMMON_STATE=$(dpkg-query -f '${Status}' -W 'apache2.2-common' 2>/dev/null | awk '{print $3}' || true)
-    if [ "$COMMON_STATE" = "installed" ] || [ "$COMMON_STATE" = "unpacked" ] ; then
-        a2enmod version
-    fi
+    # This will configure a UUID if one has not previously been set.
+    maas-provision config --init
 }
 
 configure_cluster_authbind() {
@@ -78,19 +57,11 @@
     chmod 700 /etc/authbind/byuid/$MAAS_UID
 }
 
-restart_apache2(){
-    if [ -x /usr/sbin/invoke-rc.d ]; then
-        invoke-rc.d apache2 restart || true
-    else
-        /etc/init.d/apache2 restart || true
-    fi
-}
-
 configure_maas_url(){
-    # Get the MAAS_URL on configure/reconfigure and write it to the conf files.
+    # Get the MAAS URL on configure/reconfigure and write it to the conf files.
     db_get maas-cluster-controller/maas-url || true
     if [ -n "$RET" ]; then
-        maas-provision configure-maas-url "$RET"
+        maas-provision config --region-url "$RET"
     fi
 }
 
@@ -103,35 +74,37 @@
     fi
 }
 
-
 if [ "$1" = "configure" ] && [ -z "$2" ]; then
     create_log_dir
     create_var_dir
     configure_maas_tgt
-fi
-
-if [ "$1" = "configure" ]; then
-    create_log_dir
-
-    configure_maas_tgt
+    configure_maas_url
+    configure_cluster_uuid
+    configure_cluster_authbind
+    maas-provision upgrade-cluster
+
+elif [ -n "$DEBCONF_RECONFIGURE" ]; then
     configure_maas_url
     # Only ask for a shared secret when the region is not installed
     # on the same system.
-    if [ -n "$DEBCONF_RECONFIGURE" ] && [ ! -f /usr/sbin/maas-region-admin ]; then
+    if [ ! -f /usr/sbin/maas-region-admin ]; then
         db_input high maas-cluster-controller/shared-secret
         db_go
     fi
     configure_shared_secret
 
-    # This config file may contain a private cluster UUID.  Only maas
-    # can read it; only root can write it.
-    chown root:maas /etc/maas/maas_cluster.conf
-    chmod 0640 /etc/maas/maas_cluster.conf
+elif [ "$1" = "configure" ] && dpkg --compare-versions "$2" gt 0.1+bzr266+dfsg-0ubuntu1; then
+    # If we are upgrading from an older version, then we need to obtain
+    # the cluster UUID from the old configuration file and set it with
+    # the new configuration tool.
+    if [ -f /etc/maas/maas_cluster.conf ]; then
+        uuid=$(extract_cluster_uuid /etc/maas/maas_cluster.conf)
+        maas-provision config --uuid "$uuid"
+        mv /etc/maas/maas_cluster.conf /etc/maas/maas_cluster.conf.maas-old
+        mv /etc/maas/pserv.yaml /etc/maas/pserv.yaml.maas-old
+    fi
 
-    configure_cluster_uuid
     configure_cluster_authbind
-    enable_apache_version_mod
-    restart_apache2
     maas-provision upgrade-cluster
 fi
 

=== modified file 'debian/maas-region-controller-min.apport'
--- debian/maas-region-controller-min.apport	2015-06-24 21:23:05 +0000
+++ debian/maas-region-controller-min.apport	2015-07-02 16:28:13 +0000
@@ -36,17 +36,24 @@
 
 def add_info(report, ui):
     response = ui.yesno(
-        "The contents of your /etc/maas/regiond.conf, "
-        "/etc/maas/pserv.yaml files may help developers diagnose your bug "
-        "more quickly.  However, it may contain sensitive information.  Do "
-        "you want to include it in your bug report?")
+        "The contents of /etc/maas/regiond.conf and /etc/maas/clusterd.conf "
+        "may help developers diagnose your bug more quickly. However, it may "
+        "contain sensitive information. Do you want to include it in your bug "
+        "report?")
 
-    if response is None:  # user cancelled
+    if response is None:
+        # The user cancelled.
         raise StopIteration
     elif response is True:
+        # The user agreed to include the configuration files.
         attach_conffiles(report, 'maas')
         attach_file_if_exists(
             report, '/etc/maas/regiond.conf', 'MAASRegionConfig')
+        attach_file_if_exists(
+            report, '/etc/maas/clusterd.conf', 'MAASClusterConfig')
+    else:
+        # The user declined to include the configuration files.
+        pass
 
     # Attaching log files (Upstart).
     attach_file_if_exists(

=== removed file 'debian/patches/02-pserv-config.patch'
--- debian/patches/02-pserv-config.patch	2015-06-24 21:25:03 +0000
+++ debian/patches/02-pserv-config.patch	1970-01-01 00:00:00 +0000
@@ -1,18 +0,0 @@
-Description: Use default settings for MAAS PSERV
- Use default settings for MAAS pserv. These default settings
- include port, logfile, oops directory, cobbler url and username
-Author: Andres Rodriguez <[e-mail]>
-
-=== modified file 'etc/maas/pserv.yaml'
-Index: maas-1.8.0~beta5+bzr3849.orig/etc/maas/pserv.yaml
-===================================================================
---- maas-1.8.0~beta5+bzr3849.orig.orig/etc/maas/pserv.yaml	2015-04-29 02:40:55.703960406 -0400
-+++ maas-1.8.0~beta5+bzr3849.orig/etc/maas/pserv.yaml	2015-04-29 02:41:10.567959953 -0400
-@@ -18,7 +18,6 @@
-   # resource_root: /var/lib/maas/boot-resources/current/
- 
-   # port: 69
--  port: 5244
-   ## The URL to be contacted to generate PXE configurations.
-   # generator: http://localhost/MAAS/api/1.0/pxeconfig/
-   generator: http://localhost:5240/MAAS/api/1.0/pxeconfig/

=== modified file 'debian/patches/series'
--- debian/patches/series	2015-03-31 03:23:42 +0000
+++ debian/patches/series	2015-07-02 16:28:13 +0000
@@ -1,1 +0,0 @@
-02-pserv-config.patch