Merge lp:~julian-edwards/maas/packaging into lp:~maas-maintainers/maas/packaging

[Julian Edwards]

Rename maas to maas-region-admin, and maas-cli to maas.

[Jeroen T. Vermeulen (jtv)]

A daring thrust. It looks good to me, although I'm sure I'll be forgetting something. Ultimately only experience will tell.

review: Approve

[Andres Rodriguez (andreserl)]

Hey Julian,

There will be an upgrade issue given that previous maas-region-controller-min installs 'maas' and now 'maas-cli' installs the MAAS binary. A Conflict/Replaces in maas-cli is needed against the latest version maas-region-controller-min that's shipping 'maas'.

review: Needs Fixing

[Andres Rodriguez (andreserl)]

lgtm! Let's just get this tested!

review: Approve

[Julian Edwards (julian-edwards)]

I had to fix the maas-cli match with some crazy expr code (unless you want to move the script to use bash, where it's much easier!)

[lp:~julian-edwards/maas/packaging]

239. By Julian Edwards on 2014-02-13

[r=andreserl,jtv][bug=1052805][author=julian-edwards] Rename maas to maas-region-admin, and maas-cli to maas.

=== modified file 'debian/changelog'
--- debian/changelog	2014-02-11 15:46:25 +0000
+++ debian/changelog	2014-02-13 05:31:25 +0000
@@ -1,4 +1,4 @@
-maas (1.5+bzr1909-0ubuntu2) UNRELEASED; urgency=low
+maas (1.5+bzr1930-0ubuntu1) UNRELEASED; urgency=low
 
   [ Graham Binns ]
   * debian/control: Depends on python-jsonschema.
@@ -7,7 +7,19 @@
   * debian/maas-region-controller-min.posinst: Make txlongpoll.yaml only
     readable by the app and not world readeable.
 
- -- Andres Rodriguez <[e-mail]>  Fri, 07 Feb 2014 18:24:08 -0500
+  [ Julian Edwards ]
+  * debian/extras/maas-cli renamed to debian/extras/maas, and introduce
+    a deprecation warning in favour of using maas over maas-cli.
+  * debian/extras/maas renamed to debian/extras/maas-region-admin
+  * debian/maas-cli.install: install debian/extras/maas
+  * debian/maas-dns.postinst: Invoke maas-region-admin instead of maas
+  * debian/maas-region-controller-min.install: install maas-region-admin
+    instead of maas
+  * debian/maas-region-controller.postinst: Invoke maas-region-admin instead
+    of maas
+  * debian/maas-cli.links: Link from maas to maas-cli for backward compat.
+
+ -- Julian Edwards <[e-mail]>  Wed, 12 Feb 2014 15:42:00 +1000
 
 maas (1.5+bzr1909-0ubuntu1) trusty; urgency=low
 
 
=== modified file 'debian/control'
--- debian/control	2014-02-11 05:10:18 +0000
+++ debian/control	2014-02-13 05:31:25 +0000
@@ -153,6 +153,8 @@
          python-oauth,
          ${misc:Depends},
          ${python:Depends}
+Conflicts: maas-region-controller-min (<= 1.5+bzr1909-0ubuntu1)
+Replaces: maas-region-controller-min (<= 1.5+bzr1909-0ubuntu1)
 Description: Ubuntu MAAS Client Tool
  Ubuntu MAAS Server is the successor to Orchestra. It offers a
  nice UI to provision your Ubuntu servers. Each physical server
 
=== renamed file 'debian/extras/maas-cli' => 'debian/extras/maas'
--- debian/extras/maas-cli	2012-09-19 19:00:45 +0000
+++ debian/extras/maas	2014-02-13 05:31:25 +0000
@@ -1,2 +1,6 @@
 #!/bin/sh
+if [ "`expr \"$0\" : \".*maas-cli*\"`" != "0" ];then
+    echo "  WARNING: The maas-cli command is deprecated and will be removed" \
+         "in a future\n  version.  From now on please use 'maas' instead."
+fi
 exec python -m maascli "$@"
 
=== renamed file 'debian/extras/maas' => 'debian/extras/maas-region-admin'
=== modified file 'debian/maas-cli.install'
--- debian/maas-cli.install	2012-09-20 15:20:51 +0000
+++ debian/maas-cli.install	2014-02-13 05:31:25 +0000
@@ -1,2 +1,2 @@
-debian/extras/maas-cli usr/bin
+debian/extras/maas usr/bin
 debian/tmp/usr/lib/python*/dist-packages/maascli
 
=== added file 'debian/maas-cli.links'
--- debian/maas-cli.links	1970-01-01 00:00:00 +0000
+++ debian/maas-cli.links	2014-02-13 05:31:25 +0000
@@ -0,0 +1,1 @@
+usr/bin/maas usr/bin/maas-cli
 
=== modified file 'debian/maas-dns.postinst'
--- debian/maas-dns.postinst	2014-01-13 04:06:25 +0000
+++ debian/maas-dns.postinst	2014-02-13 05:31:25 +0000
@@ -5,7 +5,7 @@
 if ([ "$1" = "configure" ] && [ -z "$2" ]) || [ -n "$DEBCONF_RECONFIGURE" ]; then
     # If /etc/bind/maas is empty, set_up_dns.
     if [ ! "$(ls -A /etc/bind/maas)" ]; then
-        maas set_up_dns
+        maas-region-admin set_up_dns
     fi
 
     # Fix permissions.
@@ -26,7 +26,7 @@
     # Remove any existing MAAS-related include line from
     # /etc/bind/named.conf.local, then re-add it.
     sed -i '/^include\s.*maas/d' /etc/bind/named.conf.local
-    maas get_named_conf --edit --config_path /etc/bind/named.conf.local
+    maas-region-admin get_named_conf --edit --config_path /etc/bind/named.conf.local
 
     invoke-rc.d bind9 restart || true
 fi
 
=== modified file 'debian/maas-region-controller-min.install'
--- debian/maas-region-controller-min.install	2013-12-02 22:19:41 +0000
+++ debian/maas-region-controller-min.install	2014-02-13 05:31:25 +0000
@@ -30,7 +30,7 @@
 debian/tmp/etc/maas/templates/commissioning-user-data
 
 # Install all other stuff
-debian/extras/maas usr/sbin
+debian/extras/maas-region-admin usr/sbin
 debian/extras/maas-region-celeryd usr/sbin
 debian/extras/20-maas.conf etc/rsyslog.d
 debian/extras/maas_remote_syslog_compress etc/cron.d
 
=== modified file 'debian/maas-region-controller.postinst'
--- debian/maas-region-controller.postinst	2014-01-15 15:38:32 +0000
+++ debian/maas-region-controller.postinst	2014-02-13 05:31:25 +0000
@@ -12,9 +12,9 @@
 RELEASE=`lsb_release -rs` || RELEASE=""
 
 maas_sync_migrate_db(){
-	maas syncdb --noinput
-	maas migrate maasserver --noinput
-	maas migrate metadataserver --noinput
+	maas-region-admin syncdb --noinput
+	maas-region-admin migrate maasserver --noinput
+	maas-region-admin migrate metadataserver --noinput
 }
 
 restart_rabbitmq(){