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

[Andres Rodriguez]

Unmerged revisions

=== modified file 'debian/maas-cluster-controller.config'
--- debian/maas-cluster-controller.config	2013-03-19 19:44:20 +0000
+++ debian/maas-cluster-controller.config	2015-04-22 01:44:57 +0000
@@ -12,8 +12,8 @@
     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/maas_local_settings.py ]; then
-            url=$(awk '$1 == "DEFAULT_MAAS_URL" { split($0,array,"\"")} END{print array[2] }' /etc/maas/maas_local_settings.py)
+        if [ -e /etc/maas/regiond.conf ]; then
+            url=$(awk '$1 == "maas_url:" { split($0,array," ")} END{print array[2] }' /etc/maas/regiond.conf)
             # 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
             if ! echo $url | grep -qs "/MAAS$"; then
@@ -22,7 +22,7 @@
             db_set maas-cluster-controller/maas-url "$url"
         else
             # Will only get here if dbconf value not already set, or
-            # /etc/maas/maas_local_settings.py doesn't exist.
+            # /etc/maas/regiond.conf doesn't exist.
             db_input medium maas-cluster-controller/maas-url || true
             db_go
         fi
 
=== 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-04-22 01:44:57 +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-03-17 20:12:30 +0000
+++ debian/maas-cluster-controller.maas-clusterd.service	2015-04-22 01:44:57 +0000
@@ -5,16 +5,15 @@
 ConditionPathExists=/etc/maas/maas_cluster.conf
 # This (pserv.yaml) will go away once streamline
 # config files or move to sqlite.
-ConditionPathExists=/etc/maas/pserv.yaml
+ConditionPathExists=/etc/maas/clusterd.conf
 ConditionPathExists=/var/lib/maas/secret
 
 [Service]
 Restart=on-failure
-EnvironmentFile=/etc/maas/maas_cluster.conf
 ExecStart=/bin/sh -ec '\
     exec /usr/bin/authbind --deep /usr/bin/twistd \
     --nodaemon --uid=maas --gid=maas --pidfile=/run/maas-cluster.pid \
-    maas-clusterd --config-file=/etc/maas/pserv.yaml > \
+    maas-clusterd --config-file=/etc/maas/clusterd.conf > \
     /var/log/maas/clusterd.log 2>&1'
 
 [Install]
 
=== 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-04-22 01:44:57 +0000
@@ -6,7 +6,7 @@
 
 respawn
 
-env CONFIG_FILE=/etc/maas/maas_cluster.conf
+env CONFIG_FILE=/etc/maas/clusterd.conf
 env LOGFILE=/var/log/maas/clusterd.log
 
 pre-start script
 
=== modified file 'debian/maas-cluster-controller.postinst'
--- debian/maas-cluster-controller.postinst	2015-03-17 17:15:56 +0000
+++ debian/maas-cluster-controller.postinst	2015-04-22 01:44:57 +0000
@@ -39,7 +39,8 @@
 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"
+    #awk '$1 == "cluster_uuid:" { split($0,array," ")} END{print array[2] }' "$1"
+    awk '{ split($1,array,"\"")} END{print array[2] }' "$1"
 }
 
 configure_cluster_uuid(){
@@ -48,23 +49,13 @@
     # we want to generate one.
     local uuid
 
-    if [ -n "$(extract_cluster_uuid /etc/maas/maas_cluster.conf)" ]; then
+    uuid=$(awk '$1 == "cluster_uuid:" { split($0,array," ")} END{print array[2] }' "/etc/maas/clusterd.conf")
+    if [ -n "$uuid" ]; 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
+        maas-provision config --init
     fi
 }
 
@@ -83,19 +74,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.
     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
 }
 
@@ -108,36 +91,35 @@
     fi
 }
 
-
 if [ "$1" = "configure" ] && [ -z "$2" ]; then
     create_log_dir
     configure_maas_tgt
-fi
-
-if [ "$1" = "configure" ]; then
-    if dpkg --compare-versions "$2" lt 0.1+bzr1239+dfsg-0ubuntu1; then
-        create_log_dir
-    fi
-
-    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 *old* CLUSTER UUID and set it.
+    if [ -f /etc/maas/maas_cluster.conf ]; then
+        uuid=$(extract_cluster_uuid)
+        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-01-21 16:24:16 +0000
+++ debian/maas-region-controller-min.apport	2015-04-22 01:44:57 +0000
@@ -21,7 +21,7 @@
 
 def add_info(report, ui):
     response = ui.yesno(
-        "The contents of your /etc/maas/maas_local_settings.py, "
+        "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?")
@@ -30,6 +30,8 @@
         raise StopIteration
     elif response is True:
         attach_conffiles(report, 'maas')
+        attach_file_if_exists(
+            report, '/etc/maas/regiond.conf', 'MAASRegionConfig')
 
     # Attaching log files
     attach_file_if_exists(
 
=== modified file 'debian/maas-region-controller-min.install'
--- debian/maas-region-controller-min.install	2014-11-05 16:38:22 +0000
+++ debian/maas-region-controller-min.install	2015-04-22 01:44:57 +0000
@@ -7,9 +7,6 @@
 # Install Apache Config
 debian/tmp/etc/maas/maas-http.conf
 
-# Install MAAS local settings
-debian/tmp/etc/maas/maas_local_settings.py
-
 # Install new preseed files
 debian/tmp/etc/maas/preseeds
 
 
=== removed file 'debian/maas-region-controller-min.links'
--- debian/maas-region-controller-min.links	2014-09-25 20:19:36 +0000
+++ debian/maas-region-controller-min.links	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-etc/maas/maas_local_settings.py usr/share/maas/maas_local_settings.py
 
=== modified file 'debian/maas-region-controller-min.maas-regiond.service'
--- debian/maas-region-controller-min.maas-regiond.service	2015-03-20 23:06:34 +0000
+++ debian/maas-region-controller-min.maas-regiond.service	2015-04-22 01:44:57 +0000
@@ -3,7 +3,7 @@
 Requires=network-online.target
 After=network-online.target
 # This will go away one we support new config files.
-ConditionPathExists=/etc/maas/maas_local_settings.py
+ConditionPathExists=/etc/maas/regiond.conf
 
 [Service]
 Restart=on-failure
 
=== modified file 'debian/maas-region-controller-min.postinst'
--- debian/maas-region-controller-min.postinst	2015-02-11 14:22:53 +0000
+++ debian/maas-region-controller-min.postinst	2015-04-22 01:44:57 +0000
@@ -8,22 +8,12 @@
 RELEASE=`lsb_release -rs` || RELEASE=""
 
 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
+    # 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
+
     # enable apache modules needed
     a2enmod proxy_http
     a2enmod expires
@@ -60,25 +50,6 @@
 	ln -sf /var/log/apache2 /var/log/maas/
 }
 
-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
-}
-
 if [ "$1" = "configure" ] && [ -z "$2" ]; then
     #########################################################
     ################ Folder Permissions  ####################
@@ -86,47 +57,17 @@
     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_settings.py
-    chmod 0640 /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"
-        db_set maas/default-maas-url "$ipaddr"
-    fi
-
-    #########################################################
     ################  Configure Logging  ####################
     #########################################################
     configure_logging
     configure_third_party_log_symlinks
 
-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"
-    fi
-
 elif [ "$1" = "configure" ] && dpkg --compare-versions "$2" gt 0.1+bzr266+dfsg-0ubuntu1; then
     # Logging changed at r2611, ensure it is set up.
     configure_logging
@@ -138,10 +79,6 @@
     # 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"
 fi
 
 invoke-rc.d apache2 restart || true
 
=== modified file 'debian/maas-region-controller.config'
--- debian/maas-region-controller.config	2013-03-20 16:44:30 +0000
+++ debian/maas-region-controller.config	2015-04-22 01:44:57 +0000
@@ -37,7 +37,7 @@
 elif [ -n "$DEBCONF_RECONFIGURE" ]; then
 	db_get maas/default-maas-url || true
 	if [ -z "$RET" ]; then
-		ipaddr=$(awk '$1 == "DEFAULT_MAAS_URL" { split($0,array,"/")} END{print array[3] }' /etc/maas/maas_local_settings.py)
+		ipaddr=$(awk '$1 == "maas_url:" { split($0,array,"/")} END{print array[3] }' /etc/maas/regiond.conf)
 		db_set maas/default-maas-url "$ipaddr"
 	fi
 	db_input low maas/default-maas-url || true
 
=== modified file 'debian/maas-region-controller.postinst'
--- debian/maas-region-controller.postinst	2015-04-08 22:14:39 +0000
+++ debian/maas-region-controller.postinst	2015-04-22 01:44:57 +0000
@@ -23,19 +23,12 @@
 
 configure_maas_database() {
 	local dbc_dbpass="$1"
-	if grep -qs "^\ \{1,\} 'PASSWORD': '[a-zA-Z0-9]\{0,\}',$" /etc/maas/maas_local_settings.py; then
-		sed -i "s/^\ \{1,\} 'PASSWORD': '[a-zA-Z0-9]\{0,\}',$/        'PASSWORD': '"$dbc_dbpass"',/" \
-                       /etc/maas/maas_local_settings.py
-	fi
+	maas-region-admin config --dbpassword "$dbc_dbpass"
 }
 
 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
+	maas-region-admin config --default-url "http://${ipaddr}/MAAS"
 }
 
 get_default_route_ip() {
@@ -57,11 +50,6 @@
 	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_settings.py
-	chmod 0640 /etc/maas/maas_local_settings.py
-
 	#########################################################
 	##########  Configure DEFAULT_MAAS_URL  #################
 	#########################################################
@@ -89,7 +77,8 @@
 
 	# Create the database
 	dbc_go maas-region-controller $@
-	configure_maas_database "$dbc_dbpass"
+	maas-region-admin config --dbhost "localhost" --dbname "$dbc_dbname" \
+            --dbuser "$dbc_dbuser" --dbpassword "$dbc_dbpass"
 
 	# Only syncdb if we have selected to install it with dbconfig-common.
 	db_get maas-region-controller/dbconfig-install
@@ -116,20 +105,30 @@
 	# make sure postgresql is running
 	restart_postgresql
 
-	# we need to regenerate the passwords and update configs.
-	db_get maas/default-maas-url
-	ipaddr="$RET"
-	configure_maas_default_url "$ipaddr"
-	# handle database upgrade
-	if [ -f /etc/dbconfig-common/maas-region-controller.conf ]; then
-		# source dbconfig-common db config for maas-region-controller
-		# before upgrading database, otherwise a new config is written
-		# but the password is no longer preserved.
-		. /etc/dbconfig-common/maas-region-controller.conf
-	else
-		dbc_go maas-region-controller $@
+	# If the version we are upgrading from ("$2") is less than 1.8.0~alpha10+bzr3754-0ubuntu1
+	# then we need migrate to new config file.
+        # TODO, we need to update this to the appropriate version
+	if dpkg --compare-versions "$2" lt 1.8.0~alpha10+bzr3754-0ubuntu1 && [ -f /etc/maas/maas_local_settings.py ]; then
+		# we need to regenerate the passwords and update configs.
+		db_get maas/default-maas-url
+		ipaddr="$RET"
+		configure_maas_default_url "$ipaddr"
+		# handle database upgrade
+		if [ -f /etc/dbconfig-common/maas-region-controller.conf ]; then
+			# source dbconfig-common db config for maas-region-controller
+			# before upgrading database, otherwise a new config is written
+			# but the password is no longer preserved.
+			. /etc/dbconfig-common/maas-region-controller.conf
+		else
+			dbc_go maas-region-controller $@
+		fi
+
+		# Reconfigure the config file.
+		maas-region-admin config --dbhost "localhost" --dbname "$dbc_dbname" \
+		    --dbuser "$dbc_dbuser" --dbpassword "$dbc_dbpass"
+
+		mv /etc/maas/maas_local_settings.py /etc/maas/maas_local_settings.py.maas-old
 	fi
-	configure_maas_database "$dbc_dbpass"
 
 	maas_sync_migrate_db
 
 
=== removed file 'debian/patches/01-fix-database-settings.patch'
--- debian/patches/01-fix-database-settings.patch	2015-01-23 14:56:56 +0000
+++ debian/patches/01-fix-database-settings.patch	1970-01-01 00:00:00 +0000
@@ -1,17 +0,0 @@
-Index: maas-1.8.0~alpha1+bzr3486.orig/contrib/maas_local_settings.py
-===================================================================
---- maas-1.8.0~alpha1+bzr3486.orig.orig/contrib/maas_local_settings.py	2015-01-23 09:50:03.185579822 -0500
-+++ maas-1.8.0~alpha1+bzr3486.orig/contrib/maas_local_settings.py	2015-01-23 09:50:03.181579822 -0500
-@@ -14,9 +14,9 @@
-     'default': {
-         # 'postgresql_psycopg2', 'postgresql', 'mysql', 'sqlite3' etc.
-         'ENGINE': 'django.db.backends.postgresql_psycopg2',
--        'NAME': '',
--        'USER': '',
--        'PASSWORD': '',
-+        'NAME': 'maasdb',
-+        'USER': 'maas',
-+        'PASSWORD': 'maas',
-         'HOST': 'localhost',
-     }
- }
 
=== removed file 'debian/patches/02-pserv-config.patch'
--- debian/patches/02-pserv-config.patch	2015-02-18 04:09:08 +0000
+++ debian/patches/02-pserv-config.patch	1970-01-01 00:00:00 +0000
@@ -1,19 +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~alpha1+bzr3523.orig/etc/maas/pserv.yaml
-===================================================================
---- maas-1.8.0~alpha1+bzr3523.orig.orig/etc/maas/pserv.yaml	2015-02-17 22:25:42.304015180 -0500
-+++ maas-1.8.0~alpha1+bzr3523.orig/etc/maas/pserv.yaml	2015-02-17 22:25:42.300015180 -0500
-@@ -18,8 +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/api/1.0/pxeconfig/
- 
 
=== modified file 'debian/patches/series'
--- debian/patches/series	2014-12-05 15:21:37 +0000
+++ debian/patches/series	2015-04-22 01:44:57 +0000
@@ -1,2 +0,0 @@
-01-fix-database-settings.patch
-02-pserv-config.patch