Merge lp:~andreserl/maas/package_split_for_charm into lp:~maas-maintainers/maas/packaging

[Andres Rodriguez]

Split maas-region-controller into maas-region-controller-min

[Scott Moser (smoser)]

I'm generally OK with this. I'd like to have it in and start testing and working on charms, rather than worrying about other things.

So, ACK

[Scott Moser (smoser)]

review: Approve

[MAAS Lander (maas-lander)]

No commit message specified.

=== modified file 'debian/changelog'
--- debian/changelog	2013-12-05 19:05:14 +0000
+++ debian/changelog	2013-12-10 17:14:35 +0000
@@ -1,4 +1,4 @@
-maas (1.4+bzr1761+dfsg-0ubuntu1) UNRELEASED; urgency=low
+maas (1.4+bzr1765+dfsg-0ubuntu1) UNRELEASED; urgency=low
 
   * UNRELEASED
 
@@ -12,6 +12,11 @@
     - debian/control: Depends on authbind for maas-cluster-controller.
     - debian/maas-cluster-controller.{postinst,postrm}: Handle creation
       and removal of required authbind file.
+  * Split maas-region-controller into maas-region-controller-min.
+    - debian/maas-region-controller-min.{postinst,postrm,prerm}: Handle
+      basic configuration for rsyslogd, squid-deb-proxy, and maas-url.
+    - debian/control: Depends on maas-region-controller-min, postgresql
+      and rabbitmq-server for maas-region-controller.
 
  -- Andres Rodriguez <[e-mail]>  Thu, 10 Oct 2013 17:07:51 -0400
 

=== modified file 'debian/control'
--- debian/control	2013-12-05 17:43:07 +0000
+++ debian/control	2013-12-10 17:14:35 +0000
@@ -45,7 +45,7 @@
  .
  This package contains common files
 
-Package: maas-region-controller
+Package: maas-region-controller-min
 Architecture: all
 Depends: apache2,
          avahi-daemon,
@@ -57,7 +57,6 @@
          libjs-yui3-full,
          libjs-yui3-min,
          maas-common (= ${binary:Version}),
-         postgresql-9.1,
          pwgen,
          python-django (>= 1.4),
          python-django-maas (= ${binary:Version}),
@@ -65,14 +64,33 @@
          python-django-south,
          python-maas-provisioningserver (= ${binary:Version}),
          python-djorm-ext-pgarray,
+         rsyslog,
+         squid-deb-proxy,
+         ${misc:Depends},
+         ${python:Depends}
+Breaks: maas-region-controller ( <= 1.4+bzr1693+dfsg-0ubuntu3 )
+Replaces: maas-region-controller ( <= 1.4+bzr1693+dfsg-0ubuntu3 )
+Description: Ubuntu MAAS Server
+ Ubuntu MAAS Server is the successor to Orchestra. It offers a
+ nice UI to provision your Ubuntu servers. Each physical server
+ (“node”) will be commissioned automatically on first boot.
+ During the commissioning process administrators are able to
+ configure hardware settings manually before an automated smoke
+ test and burn-in test are done. Once commissioned, a node can
+ be deployed on demand by name, or allocated to a queue for
+ dynamic allocation to services being deployed on this MAAS.
+ .
+ This package installs the region controller services: the web
+ UI.
+
+Package: maas-region-controller
+Architecture: all
+Depends: maas-region-controller-min (= ${binary:Version}),
+         postgresql (>= 9.1),
          rabbitmq-server,
-         rsyslog,
-         squid-deb-proxy,
          ${misc:Depends},
          ${python:Depends}
 Recommends: openssh-server, maas-dns (= ${binary:Version})
-Breaks: maas ( <= 0.1+bzr1048+dfsg-0ubuntu1 )
-Replaces: maas ( <= 0.1+bzr1048+dfsg-0ubuntu1 )
 Description: Ubuntu MAAS Server
  Ubuntu MAAS Server is the successor to Orchestra. It offers a
  nice UI to provision your Ubuntu servers. Each physical server
@@ -265,8 +283,7 @@
 Package: maas-dns
 Architecture: all
 Depends: bind9,
- maas-region-controller (= ${binary:Version}),
- maas-dhcp (= ${binary:Version}),
+ maas-region-controller-min (= ${binary:Version}),
  ${misc:Depends}
 Conflicts: dnsmasq
 Breaks: maas-dhcp (<= 0.1+bzr777+dfsg-0ubuntu1)

=== renamed file 'debian/maas-region-controller.apport' => 'debian/maas-region-controller-min.apport'
--- debian/maas-region-controller.apport	2012-09-25 07:54:44 +0000
+++ debian/maas-region-controller-min.apport	2013-12-10 17:14:35 +0000
@@ -1,6 +1,6 @@
 #!/usr/bin/python
 
-'''apport hook for bind9
+'''apport hook for maas-region-controller
 
 (c) 2012 Canonical Ltd.
 Author: Andres Rodriguez <[e-mail]>

=== renamed file 'debian/maas-region-controller.dirs' => 'debian/maas-region-controller-min.dirs'
=== renamed file 'debian/maas-region-controller.install' => 'debian/maas-region-controller-min.install'
=== renamed file 'debian/maas-region-controller.links' => 'debian/maas-region-controller-min.links'
=== renamed file 'debian/maas-region-controller.lintian-overrides' => 'debian/maas-region-controller-min.lintian-overrides'
=== renamed file 'debian/maas-region-controller.logrotate' => 'debian/maas-region-controller-min.logrotate'
=== renamed file 'debian/maas-region-controller.maas-region-celery.upstart' => 'debian/maas-region-controller-min.maas-region-celery.upstart'
=== renamed file 'debian/maas-region-controller.maas-txlongpoll.upstart' => 'debian/maas-region-controller-min.maas-txlongpoll.upstart'
=== added file 'debian/maas-region-controller-min.postinst'
--- debian/maas-region-controller-min.postinst	1970-01-01 00:00:00 +0000
+++ debian/maas-region-controller-min.postinst	2013-12-10 17:14:35 +0000
@@ -0,0 +1,164 @@
+#!/bin/sh
+
+set -e
+
+. /usr/share/debconf/confmodule
+db_version 2.0
+
+RELEASE=`lsb_release -rs` || RELEASE=""
+
+restart_squid_deb_proxy() {
+    invoke-rc.d squid-deb-proxy restart || true
+}
+
+configure_region_http() {
+    case $RELEASE in
+        12.04|12.10|13.04)
+            # handle apache configs
+            if [ -e /etc/maas/maas-http.conf -a \
+                ! -e /etc/apache2/conf.d/maas-http.conf ]; then
+                ln -sf /etc/maas/maas-http.conf /etc/apache2/conf.d/maas-http.conf
+            fi
+            ;;
+        *)
+            # handle apache configs
+            if [ -e /etc/maas/maas-http.conf -a \
+                ! -e /etc/apache2/conf-enabled/maas-http.conf ]; then
+                ln -sf /etc/maas/maas-http.conf /etc/apache2/conf-enabled/maas-http.conf
+            fi
+            ;;
+    esac
+    # enable apache modules needed
+    a2enmod proxy_http
+    a2enmod expires
+    a2enmod wsgi
+}
+
+configure_maas_default_url() {
+    local ipaddr="$1"
+
+    if grep -qs "^DEFAULT_MAAS_URL\ \= \"[a-zA-Z0-9:/.]\{0,\}\"$" /etc/maas/maas_local_settings.py; then
+        sed -i "s/^DEFAULT_MAAS_URL\ \= \"[a-zA-Z0-9:/.]\{0,\}\"$/DEFAULT_MAAS_URL = \"http:\/\/"$ipaddr"\/MAAS\"/" \
+            /etc/maas/maas_local_settings.py
+    fi
+}
+
+get_default_route_ip() {
+    while read Iface Destination Gateway Flags RefCnt Use Metric Mask MTU Window IRTT; do
+        [ "$Mask" = "00000000" ] && break
+    done < /proc/net/route
+    interface="$Iface"
+    ipaddr=$(LC_ALL=C /sbin/ip -4 addr list dev "$interface" scope global)
+    ipaddr=${ipaddr#* inet }
+    ipaddr=${ipaddr%%/*}
+    echo $ipaddr
+}
+
+configure_maas_squid_deb_proxy() {
+    local ipaddr="$1"
+
+    if [ -e /usr/share/maas/conf/99-maas -a \
+        ! -L /etc/squid-deb-proxy/mirror-dstdomain.acl.d/99-maas ]; then
+        ln -sf /usr/share/maas/conf/99-maas \
+               /etc/squid-deb-proxy/mirror-dstdomain.acl.d/99-maas
+    fi
+
+    sed -i "s/\(^[a-zA-Z0-9\.\-].*\) # maasurl$/$ipaddr # maasurl/" \
+        /usr/share/maas/conf/99-maas
+}
+
+if [ "$1" = "configure" ] && [ -z "$2" ]; then
+    #########################################################
+    ################ Folder Permissions  ####################
+    #########################################################
+    mkdir -p /var/lib/maas/media/storage
+    chown -R maas:maas /var/lib/maas/
+
+    # Config will contain credentials, so should be readable
+    # by the application but nobody else.
+    chown root:maas \
+        /etc/maas/maas_local_celeryconfig.py \
+        /etc/maas/maas_local_settings.py
+    chmod 0640 \
+        /etc/maas/maas_local_celeryconfig.py \
+        /etc/maas/maas_local_settings.py
+
+    #########################################################
+    ################  Configure Apache2  ####################
+    #########################################################
+    configure_region_http
+
+    #########################################################
+    ##########  Configure DEFAULT_MAAS_URL  #################
+    #########################################################
+
+    # Obtain IP address of default route and change DEFAULT_MAAS_URL
+    # if default-maas-url has not been preseeded.
+    db_get maas/default-maas-url
+    ipaddr="$RET"
+    if [ -z "$RET" ]; then
+        ipaddr=$(get_default_route_ip)
+    fi
+    # Set the IP address of the interface with default route
+    if [ -n "$ipaddr" ]; then
+        configure_maas_default_url "$ipaddr"
+        configure_maas_squid_deb_proxy "$ipaddr"
+        db_set maas/default-maas-url "$ipaddr"
+    fi
+
+    #########################################################
+    ################  Configure Logging  ####################
+    #########################################################
+
+    # Give appropriate permissions
+    if [ ! -f /var/log/maas/maas.log ]; then
+        touch /var/log/maas/maas.log
+    fi
+    chown -R maas:maas /var/log/maas
+    chmod -R 775 /var/log/maas/oops
+
+    # Create log directory base
+    mkdir -p /var/log/maas/rsyslog
+    chown -R syslog:syslog /var/log/maas/rsyslog
+    # Make sure rsyslog reads our config
+    invoke-rc.d rsyslog restart
+
+    #########################################################
+    ################### Squid-deb-proxy  ####################
+    #########################################################
+    # Make sure squid-deb-proxy reads our config (99-maas)
+    restart_squid_deb_proxy
+
+elif [ -n "$DEBCONF_RECONFIGURE" ]; then
+    # Set the IP address of the interface with default route
+    db_get maas/default-maas-url
+    ipaddr="$RET"
+    if [ -n "$ipaddr" ]; then
+        configure_maas_default_url "$ipaddr"
+        configure_maas_squid_deb_proxy "$ipaddr"
+    fi
+
+elif [ "$1" = "configure" ] && dpkg --compare-versions "$2" gt 0.1+bzr266+dfsg-0ubuntu1; then
+    # If upgrading to any later package version, then upgrade db.
+    invoke-rc.d apache2 stop || true
+
+    # make sure maas http config is symlinked
+    configure_region_http
+
+    # we need to regenerate the passwords and update configs.
+    db_get maas/default-maas-url
+    ipaddr="$RET"
+    configure_maas_default_url "$ipaddr"
+    configure_maas_squid_deb_proxy "$ipaddr"
+fi
+
+invoke-rc.d apache2 restart || true
+
+restart_squid_deb_proxy
+
+invoke-rc.d maas-txlongpoll restart || true
+invoke-rc.d maas-region-celery restart || true
+
+db_stop
+
+#DEBHELPER#

=== added file 'debian/maas-region-controller-min.postrm'
--- debian/maas-region-controller-min.postrm	1970-01-01 00:00:00 +0000
+++ debian/maas-region-controller-min.postrm	2013-12-10 17:14:35 +0000
@@ -0,0 +1,39 @@
+#!/bin/sh
+
+set -e
+
+. /usr/share/debconf/confmodule
+
+RELEASE=`lsb_release -rs` ||  RELEASE=""
+
+case "$1" in
+    purge)
+        rm -rf /var/log/maas
+        rm -rf /var/lib/maas
+        case $RELEASE in
+            12.04|12.10|13.04)
+                if [ -h /etc/apache2/conf.d/maas-http.conf ]; then
+                    rm -rf /etc/apache2/conf.d/maas-http.conf
+                fi
+                ;;
+            *)
+                if [ -h /etc/apache2/conf-enabled/maas-http.conf ]; then
+                    rm -rf /etc/apache2/conf-enabled/maas-http.conf
+                fi
+                ;;
+        esac
+
+        # Restarting apache2
+        if [ -x /usr/sbin/invoke-rc.d ]; then
+            invoke-rc.d apache2 restart || true
+        fi
+
+        # Delete symlink
+        if [ -L /etc/squid-deb-proxy/mirror-dstdomain.acl.d/99-maas ]; then
+            rm -rf /etc/squid-deb-proxy/mirror-dstdomain.acl.d/99-maas
+        fi
+esac
+
+#DEBHELPER#
+
+db_stop

=== added file 'debian/maas-region-controller-min.prerm'
--- debian/maas-region-controller-min.prerm	1970-01-01 00:00:00 +0000
+++ debian/maas-region-controller-min.prerm	2013-12-10 17:14:35 +0000
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+set -e
+
+. /usr/share/debconf/confmodule
+
+#DEBHELPER#
+
+invoke-rc.d apache2 stop || true

=== modified file 'debian/rules'
--- debian/rules	2012-11-22 23:44:39 +0000
+++ debian/rules	2013-12-10 17:14:35 +0000
@@ -9,9 +9,9 @@
 	dh $@ --with python2,apport --buildsystem=python_distutils
 
 override_dh_installinit:
+	dh_installinit --name maas-txlongpoll --no-start
+	dh_installinit --name maas-region-celery --no-start
 	dh_installinit --name maas-pserv
-	dh_installinit --name maas-txlongpoll
-	dh_installinit --name maas-region-celery
 	dh_installinit --name maas-cluster-celery
 	dh_installinit --name maas-dhcp-server