Merge lp:~chad.smith/charms/precise/landscape-client/lsclient-origin-param into lp:~charmers/charms/precise/landscape-client/trunk

[Chad Smith]

The branch updates landscape-client charm to allow passing an "origin" parameter to designate a different repository from which to pull landscape-client & landscape-common debs. If unspecified, the origin parameter defaults to "distro" which will not alter PPAs or apt-sources on the juju unit and just deploy the distribution's stock landscape-client deb.

Here are the changes I put in to add an origin param that takes any of the following formats:
#PPAs
ppa:blah/blah

# APT SOURCE LINES
deb http://archive.ubuntu.com/ubuntu precise main

# private repo with or without keys
https://landscape-person:<email address hidden>/landscape/lds-trunk/ubuntu|HEXKEY

[David Britton (dpb)]

[1] Let's get rid of the grub-pc workaround. I don't think we want that in the official charm.

[2] Can we change the sources file to something like "landscape-client-origin.list"?

[3] Add in ;; to the default (*) case. Just for sanity sake.

[4] Move the rm into add_apt_source, just to keep it with like code, also change to simply rm -f $SOURCES_FILE, which will always succeed (then you can take it out of the if block)

[5] Change interactions in the case statement with the souces_file to '>' from '>>' to make it clear that the file is being recreated each time

[6] Probably want to specially handle the case of ORIGIN not set. like, a sentinel in add_apt_source or something like that.

[7] Remove stray ntp installation.

[David Britton (dpb)]

Looks great, just clean up small things. I think the logic in it is good. +1

review: Approve

[lp:~chad.smith/charms/precise/landscape-client/lsclient-origin-param]

24. By Chad Smith on 2013-02-27

resolve dbp's review comments [1-5] & 7
add_apt_source sentinal is already handled if $ORIGIN default case statement

[David Britton (dpb)]

Chad, also I found another problem:

If you use this charm with old clients (like what is in precise), it will not work with a password on the account. We need to try either specifying both password and key if either/or is specified (if the config file can handle it), or specify the right one based on client version.

review: Needs Fixing

[lp:~chad.smith/charms/precise/landscape-client/lsclient-origin-param]

25. By Chad Smith on 2013-03-02

backwards compatibility writing registration_password and registration_key into config for precise ls-client

[David Britton (dpb)]

Glad the easier solution works. Looks good, +1

review: Approve

[Chad Smith (chad.smith)]

Validated as working w/ precise distro landscape-client and our PPA of landscape-client from trunk.

[lp:~chad.smith/charms/precise/landscape-client/lsclient-origin-param]

26. By Chad Smith on 2013-03-07

merge in upstream meta-data for landscape-client

27. By Chad Smith on 2013-03-07

bump revision beyond new upstream

[Mark Mims (mark-mims)]

love to see the origin bits consolidated with charm-helpers... i.e., please add the signed-keys bits into charm-helpers sometime and use that for this charm

https://bugs.launchpad.net/charm-tools/+bug/1154339

review: Approve

=== modified file 'README'
--- README	2013-01-18 04:12:34 +0000
+++ README	2013-03-07 20:24:20 +0000
@@ -13,7 +13,7 @@
 
 landscape-client:
     account-name: <account_name_here>
-    registration-password: <registration_key_here>
+    registration-key: <registration_key_here>
     computer-title: <computer_title_here>
     tags: <csv_tag_list>
 
@@ -24,7 +24,7 @@
 
 landscape-client:
     account-name: standalone
-    registration-password: 128-qosk-7382
+    registration-key: 128-qosk-7382
     computer-title: Dev Laptop 09
     tags: laptop,precise,developer
     ping-url = http://landscape.example.com/ping
@@ -49,7 +49,7 @@
     of Landscape.  In the dedicated version of Landscape (LDS), this will
     always be "standalone"
 
-registration-password:
+registration-key:
     The account registration key, found in the Landscape account GUI.  
 
 computer-title:

=== modified file 'config.yaml'
--- config.yaml	2013-01-18 09:45:23 +0000
+++ config.yaml	2013-03-07 20:24:20 +0000
@@ -1,4 +1,12 @@
 options:
+  origin:
+    description: |
+      Origin of ppa or private deb repository from which to install
+      landscape-client.  May be one of the following:
+      distro (default), ppa:somecustom/ppa or a full APT url source
+      entry with optional key. For example:
+      deb https://[e-mail]/myrepo precise main|YOURAPTKEY"
+    type: string
   data-path:
     description: |
       The directory to store data files in (default:
@@ -42,9 +50,9 @@
     description: |
       The account this computer belongs to.
     type: string
-  registration-password:
+  registration-key:
     description: |
-      The account-wide password used for registering clients.
+      The account-wide key used for registering clients.
     type: string
   exchange-interval:
     description: |

=== modified file 'hooks/common.py'
--- hooks/common.py	2013-02-01 11:55:50 +0000
+++ hooks/common.py	2013-03-07 20:24:20 +0000
@@ -20,7 +20,12 @@
     client_config = Configuration()
     client_config.reload()
     for key, value in service_config.items():
-        setattr(client_config, key.replace("-", "_"), value)
+        if key != "origin":
+            setattr(client_config, key.replace("-", "_"), value)
+        if key == "registration-key":
+            # Use registration_password additionally for
+            # backwards compatibility with landscape-client in precise.
+            setattr(client_config, "registration_password", value)
     client_config.write()
     return try_to_register()
 

=== modified file 'hooks/install'
--- hooks/install	2012-05-02 21:33:06 +0000
+++ hooks/install	2013-03-07 20:24:20 +0000
@@ -1,3 +1,68 @@
 #!/bin/bash
 
-apt-get install -y landscape-client
+set -e
+
+# Where to get our debs from
+ORIGIN=`config-get origin`
+
+SOURCES_FILE=/etc/apt/sources.list.d/landscape-client-origin.list
+CODENAME=$(cat /etc/lsb-release | grep CODENAME | sed 's/.*=//')
+
+add_apt_source() {
+    # Allow sources of the formats:
+    #  https/blah/blah|KEYKEYKEY
+    #  deb https/blah/blah precise main|KEYKEYKEY 
+    #  ppa:landscape/trunk
+    if [ "$1" == "distro" ]; then
+        # do nothing extra
+        return
+    fi
+    src=`echo $1| awk -F '|' '{print $1}'`
+    key=`echo $1| awk -F '|' '{print $2}'`
+
+    rm -f $SOURCES_FILE
+
+    case "$src" in
+        ppa:*)
+            apt-add-repository -y $src
+            return
+            ;;
+        deb*)
+            # Blindly take a apt source line
+            if [ ! -z "$key" ]; then
+                apt-key adv --keyserver keyserver.ubuntu.com --recv-key $key
+            fi
+            echo "$src" > $SOURCES_FILE
+            chmod go+r $SOURCES_FILE
+            return
+            ;;
+        http*)
+            # take a url and make it a valid APT source for the current release
+            if [ ! -z "$key" ]; then
+                apt-key adv --keyserver keyserver.ubuntu.com --recv-key $key
+            fi
+            echo "deb $src $CODENAME main" > $SOURCES_FILE
+            chmod go+r $SOURCES_FILE
+            return
+            ;;
+        *)
+            echo "Invalid repository origin specified: '" $src "'"
+            ;;
+    esac
+}
+
+function apt_get() {
+    DEBIAN_FRONTEND=noninteractive apt-get \
+        --allow-unauthenticated -y \
+        -o Dpkg::Options::='--force-confold' $*;
+}
+
+
+# Workaround for: https://bugs.launchpad.net/juju/+bug/993034
+echo 'Acquire::https { Proxy "false"; };' >> /etc/apt/apt.conf.d/02juju-apt-proxy
+
+apt_get install apt-transport-https wget
+
+add_apt_source "$ORIGIN"
+apt_get update
+apt_get install landscape-client

=== modified file 'revision'
--- revision	2013-02-15 09:56:21 +0000
+++ revision	2013-03-07 20:24:20 +0000
@@ -1,1 +1,1 @@
-8
+9