Merge lp:~milner/landscape-client/add-more-preseeding-goodness into lp:~landscape/landscape-client/trunk

[Mike Milner]

- Adds more variables to debconf to allow them to be pre-seeded.
- Fixes to landscape-config to respect the --no-start command line flag

[lp:~milner/landscape-client/add-more-preseeding-goodness]

375. By Mike Milner on 2011-10-07

Removed the low-priority debconf questions so they don't get asked during a
dpk-reconfigure. They will only be accesible using preseed or
debconf-set-selections.

[Thomas Herve (therve)]

[1] I have several test failures, related to your config file changes most likely.

[2] You should remove the otp option. This is something internal, not meant to be used by preseed.

review: Needs Fixing

[Thomas Herve (therve)]

Sorry, forget what I said about otp.

[lp:~milner/landscape-client/add-more-preseeding-goodness]

376. By Mike Milner on 2011-10-20

Merged from trunk.

377. By Mike Milner on 2011-10-20

Fixed failing tests.

378. By Mike Milner on 2011-10-20

Fix lint issues.

[Mike Milner (milner)]

> [1] I have several test failures, related to your config file changes most
> likely.

Fixed - sorry I missed these!

[Thomas Herve (therve)]

[3]
+ args = ["--silent", "--no-start"]
+ args += ["--computer-title", ""]
+ args += ["--account-name", ""]
+ args += ["--registration-password", ""]
+ args += ["--url", "https://landscape.canonical.com/message-system"]
+ args += ["--exchange-interval", "900"]
+ args += ["--urgent-exchange-interval", "60"]
+ args += ["--ping-url", "http://landscape.canonical.com/ping"]
+ args += ["--ping-interval", "30"]
+ args += ["--http-proxy", ""]
+ args += ["--https-proxy", ""]
+ args += ["--otp", ""]
+ args += ["--tags", ""]

Can you create the list "normally" instead?

+ args = ["--silent", "--no-start",
+ "--computer-title", "", ...

+1!

review: Approve

[lp:~milner/landscape-client/add-more-preseeding-goodness]

379. By Mike Milner on 2011-10-24

Fixed list formatting.

[Mike Milner (milner)]

> [3]
> + args = ["--silent", "--no-start"]
> + args += ["--computer-title", ""]
> + args += ["--account-name", ""]
> + args += ["--registration-password", ""]
> + args += ["--url", "https://landscape.canonical.com/message-system"]
> + args += ["--exchange-interval", "900"]
> + args += ["--urgent-exchange-interval", "60"]
> + args += ["--ping-url", "http://landscape.canonical.com/ping"]
> + args += ["--ping-interval", "30"]
> + args += ["--http-proxy", ""]
> + args += ["--https-proxy", ""]
> + args += ["--otp", ""]
> + args += ["--tags", ""]
>
> Can you create the list "normally" instead?
>
> + args = ["--silent", "--no-start",
> + "--computer-title", "", ...

Fixed!

[Kevin McDermott (bigkevmcd)]

Looks good, +1

review: Approve

=== modified file 'debian/landscape-client.config'
--- debian/landscape-client.config	2011-10-04 11:33:05 +0000
+++ debian/landscape-client.config	2011-10-24 17:41:25 +0000
@@ -21,7 +21,14 @@
     ACCOUNT_NAME=$(get_var_from_file "account_name" "$CONFIGFILE")
     REGISTRATION_PASSWORD=$(get_var_from_file "registration_password" "$CONFIGFILE")
     URL=$(get_var_from_file "url" "$CONFIGFILE")
+    EXCHANGE_INTERVAL=$(get_var_from_file "exchange_interval" "$CONFIGFILE")
+    URGENT_EXCHANGE_INTERVAL=$(get_var_from_file "urgent_exchange_interval" "$CONFIGFILE")
     PING_URL=$(get_var_from_file "ping_url" "$CONFIG_FILE")
+    PING_INTERVAL=$(get_var_from_file "ping_interval" "$CONFIGFILE")
+    HTTP_PROXY=$(get_var_from_file "http_proxy" "$CONFIGFILE")
+    HTTPS_PROXY=$(get_var_from_file "https_proxy" "$CONFIGFILE")
+    OTP=$(get_var_from_file "otp" "$CONFIGFILE")
+    TAGS=$(get_var_from_file "tags" "$CONFIG_FILE")
 
     # Store values from config file into
     # debconf db.
@@ -30,7 +37,14 @@
     db_set $PACKAGE/account_name $ACCOUNT_NAME
     db_set $PACKAGE/registration_password $REGISTRATION_PASSWORD
     db_set $PACKAGE/url $URL
+    db_set $PACKAGE/exchange_interval $EXCHANGE_INTERVAL
+    db_set $PACKAGE/urgent_exchange_interval $URGENT_EXCHANGE_INTERVAL
     db_set $PACKAGE/ping_url $PING_URL
+    db_set $PACKAGE/ping_interval $PING_INTERVAL
+    db_set $PACKAGE/http_proxy $HTTP_PROXY
+    db_set $PACKAGE/https_proxy $HTTPS_PROXY
+    db_set $PACKAGE/otp $OTP
+    db_set $PACKAGE/tags $TAGS
 fi
 
 # Ask questions.

=== modified file 'debian/landscape-client.postinst'
--- debian/landscape-client.postinst	2011-10-03 14:09:48 +0000
+++ debian/landscape-client.postinst	2011-10-24 17:41:25 +0000
@@ -37,26 +37,51 @@
             REGISTRATION_PASSWORD="${RET}"
             db_get $PACKAGE/url
             URL="${RET}"
+            db_get $PACKAGE/exchange_interval
+            EXCHANGE_INTERVAL="${RET}"
+            db_get $PACKAGE/urgent_exchange_interval
+            URGENT_EXCHANGE_INTERVAL="${RET}"
             db_get $PACKAGE/ping_url
             PING_URL="${RET}"
+            db_get $PACKAGE/ping_interval
+            PING_INTERVAL="${RET}"
+            db_get $PACKAGE/http_proxy
+            HTTP_PROXY="${RET}"
+            db_get $PACKAGE/https_proxy
+            HTTPS_PROXY="${RET}"
+            db_get $PACKAGE/otp
+            OTP="${RET}"
+            db_get $PACKAGE/tags
+            TAGS="${RET}"
 
             # Create new configuration, with private mode
             TEMPFILE=$(mktemp -p /etc/landscape)
             cat > $TEMPFILE <<END
 [client]
 log_level = info
-url = ${URL}
-ping_url = ${PING_URL}
 data_path = /var/lib/landscape/client
 END
             chown landscape $TEMPFILE
             mv $TEMPFILE $CONFIG_FILE
 
+            # Configure landscape
+            landscape-config --silent --no-start \
+                --computer-title "$COMPUTER_TITLE" \
+                --account-name "$ACCOUNT_NAME" \
+                --registration-password "$REGISTRATION_PASSWORD" \
+                --url "$URL" \
+                --exchange-interval "$EXCHANGE_INTERVAL" \
+                --urgent-exchange-interval "$URGENT_EXCHANGE_INTERVAL" \
+                --ping-url "$PING_URL" \
+                --ping-interval "$PING_INTERVAL" \
+                --http-proxy "$HTTP_PROXY" \
+                --https-proxy "$HTTPS_PROXY" \
+                --otp "$OTP" \
+                --tags "$TAGS"
+
             # If we got the needed information, actually do the registration.
             if [ -n "$ACCOUNT_NAME" -a -n "$COMPUTER_TITLE" ]; then
-                landscape-config --silent --ok-no-register -a "$ACCOUNT_NAME" \
-                                          -p "$REGISTRATION_PASSWORD" \
-                                          -t "$COMPUTER_TITLE"
+                landscape-config --silent --ok-no-register
             fi
         else
             # Fix non-private permissions

=== modified file 'debian/landscape-client.templates'
--- debian/landscape-client.templates	2011-10-11 19:38:46 +0000
+++ debian/landscape-client.templates	2011-10-24 17:41:25 +0000
@@ -23,12 +23,59 @@
 _Description: Landscape Server URL:
  The server URL to connect to.
 
+Template: landscape-client/exchange_interval
+Type: string
+Default: 900
+_Description: Message Exchange Interval:
+ Interval, in seconds, between normal message exchanges with the Landscape
+ server.
+
+Template: landscape-client/urgent_exchange_interval
+Type: string
+Default: 60
+_Description: Urgent Message Exchange Interval:
+ Interval, in seconds, between urgent message exchanges with the Landscape
+ server.
+
 Template: landscape-client/ping_url
 Type: string
 Default: http://landscape.canonical.com/ping
 _Description: Landscape PingServer URL:
  The URL to perform lightweight exchange initiation with.
 
+Template: landscape-client/ping_interval
+Type: string
+Default: 30
+_Description: Ping Interval:
+ Interval, in seconds, between client ping exchanges with the Landscape server.
+
+Template: landscape-client/http_proxy
+Type: string
+Default:
+_Description: HTTP proxy (blank for none):
+ The URL of the HTTP proxy, if one is needed.
+
+Template: landscape-client/https_proxy
+Type: string
+Default:
+_Description: HTTPS proxy (blank for none):
+ The URL of the HTTPS proxy, if one is needed.
+
+Template: landscape-client/otp
+Type: string
+Default:
+_Description: The OTP to use in initial configuration:
+ The OneTimePassword to use for initial registration with the Landscape server.
+ This is only required for Cloud or Preseeded installs.
+
+Template: landscape-client/tags
+Type: string
+Default:
+_Description: Initial tags for first registration
+ Comma separated list of tags which will be assigned to this computer on its
+ first registration.  Once the machine is registered, these tags can only be
+ changed using the Landscape server.
+
 Template: landscape-client/register_system
 Type: boolean
 Default: false

=== modified file 'debian/po/templates.pot'
--- debian/po/templates.pot	2011-09-30 16:09:07 +0000
+++ debian/po/templates.pot	2011-10-24 17:41:25 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: [e-mail]\n"
-"POT-Creation-Date: 2011-09-30 11:01-0300\n"
+"POT-Creation-Date: 2011-10-06 10:12-0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
@@ -74,24 +74,119 @@
 #. Type: string
 #. Description
 #: ../landscape-client.templates:5001
+msgid "Message Exchange Interval:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../landscape-client.templates:5001
+msgid ""
+"Interval, in seconds, between normal message exchanges with the Landscape "
+"server."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../landscape-client.templates:6001
+msgid "Urgent Message Exchange Interval:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../landscape-client.templates:6001
+msgid ""
+"Interval, in seconds, between urgent message exchanges with the Landscape "
+"server."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../landscape-client.templates:7001
 msgid "Landscape PingServer URL:"
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../landscape-client.templates:5001
+#: ../landscape-client.templates:7001
 msgid "The URL to perform lightweight exchange initiation with."
 msgstr ""
 
+#. Type: string
+#. Description
+#: ../landscape-client.templates:8001
+msgid "Ping Interval:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../landscape-client.templates:8001
+msgid ""
+"Interval, in seconds, between client ping exchanges with the Landscape "
+"server."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../landscape-client.templates:9001
+msgid "HTTP proxy (blank for none):"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../landscape-client.templates:9001
+msgid "The URL of the HTTP proxy, if one is needed."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../landscape-client.templates:10001
+msgid "HTTPS proxy (blank for none):"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../landscape-client.templates:10001
+msgid "The URL of the HTTPS proxy, if one is needed."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../landscape-client.templates:11001
+msgid "The OTP to use in initial configuration:"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../landscape-client.templates:11001
+msgid ""
+"The OneTimePassword to use for initial registration with the Landscape "
+"server. This is only required for Cloud or Preseeded installs."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../landscape-client.templates:12001
+msgid "Initial tags for first registration"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../landscape-client.templates:12001
+msgid ""
+"Comma separated list of tags which will be assigned to this computer on its "
+"first registration.  Once the machine is registered, these tags can only be "
+"changed using the Landscape server."
+msgstr ""
+
 #. Type: boolean
 #. Description
-#: ../landscape-client.templates:6001
+#: ../landscape-client.templates:13001
 msgid "Register this system with the Landscape server?"
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../landscape-client.templates:6001
+#: ../landscape-client.templates:13001
 msgid ""
 "Register this system with a preexisting Landscape account.  Please\n"
 " go to http://landscape.canonical.com if you need a Landscape account."

=== modified file 'landscape/broker/config.py'
--- landscape/broker/config.py	2011-08-19 15:47:27 +0000
+++ landscape/broker/config.py	2011-10-24 17:41:25 +0000
@@ -79,7 +79,7 @@
                           help="The URL of the HTTPS proxy, if one is needed.")
         parser.add_option("--cloud", action="store_true",
                           help="Set this if your computer is in an EC2 cloud.")
-        parser.add_option("--otp",
+        parser.add_option("--otp", default="",
                           help="The OTP to use in cloud configuration.")
         parser.add_option("--tags",
                           help="Comma separated list of tag names to be sent "

=== modified file 'landscape/configuration.py'
--- landscape/configuration.py	2011-01-12 17:05:48 +0000
+++ landscape/configuration.py	2011-10-24 17:41:25 +0000
@@ -378,7 +378,7 @@
             if self._get_invalid_tags(self.config.tags):
                 self.show_help("Tag names may only contain alphanumeric "
                               "characters.")
-                self.config.tags = None # Reset for the next prompt
+                self.config.tags = None  # Reset for the next prompt
             else:
                 break
 
@@ -439,11 +439,12 @@
     if config.https_proxy is None and os.environ.get("https_proxy"):
         config.https_proxy = os.environ["https_proxy"]
 
-    if config.silent:
+    if config.silent and not config.no_start:
         if not config.get("otp") and (not config.get("account_name") or not
                                           config.get("computer_title")):
             raise ConfigurationError("An account name and computer title are "
                                      "required.")
+    if config.silent:
         if config.get("script_users"):
             invalid_users = get_invalid_users(config.get("script_users"))
             if invalid_users:
@@ -622,7 +623,6 @@
         print_text(str(error), error=True)
         sys.exit(1)
 
-
     # Disable startup on boot and stop the client, if one is running.
     if config.disable:
         stop_client_and_disable_init_script()
@@ -636,10 +636,11 @@
         sys.exit("Aborting Landscape configuration")
 
     # Attempt to register the client.
-    if config.silent:
-        register(config)
-    else:
-        answer = raw_input("\nRequest a new registration for "
-                           "this computer now? (Y/n): ")
-        if not answer.upper().startswith("N"):
+    if not config.no_start:
+        if config.silent:
             register(config)
+        else:
+            answer = raw_input("\nRequest a new registration for "
+                               "this computer now? (Y/n): ")
+            if not answer.upper().startswith("N"):
+                register(config)

=== modified file 'landscape/tests/test_configuration.py'
--- landscape/tests/test_configuration.py	2011-07-05 05:09:11 +0000
+++ landscape/tests/test_configuration.py	2011-10-24 17:41:25 +0000
@@ -720,6 +720,60 @@
 account_name = account
 """ % config.data_path)
 
+    def test_silent_setup_no_register(self):
+        """
+        Called with command line options to write a config file but no
+        registration or validation of parameters is attempted.
+        """
+        # Make sure no sysvconfig modifications are attempted
+        self.mocker.patch(SysVConfig)
+        self.mocker.replay()
+
+        config = self.get_config(["--silent", "--no-start"])
+        setup(config)
+        self.assertEqual(self.get_content(config), """\
+[client]
+url = https://landscape.canonical.com/message-system
+data_path = %s
+""" % config.data_path)
+
+    def test_silent_setup_no_register_with_default_preseed_params(self):
+        """
+        Make sure that the configuration can be used to write the
+        configuration file after a fresh install.
+        """
+        # Make sure no sysvconfig modifications are attempted
+        self.mocker.patch(SysVConfig)
+        self.mocker.replay()
+
+        args = ["--silent", "--no-start",
+                "--computer-title", "",
+                "--account-name", "",
+                "--registration-password", "",
+                "--url", "https://landscape.canonical.com/message-system",
+                "--exchange-interval", "900",
+                "--urgent-exchange-interval", "60",
+                "--ping-url", "http://landscape.canonical.com/ping",
+                "--ping-interval", "30",
+                "--http-proxy", "",
+                "--https-proxy", "",
+                "--otp", "",
+                "--tags", ""]
+        config = self.get_config(args)
+        setup(config)
+        self.assertEqual(self.get_content(config),
+            "[client]\n"
+            "http_proxy = \n"
+            "tags = \n"
+            "data_path = %s\n"
+            "registration_password = \n"
+            "account_name = \n"
+            "url = https://landscape.canonical.com/message-system\n"
+            "computer_title = \n"
+            "https_proxy = \n"
+            "ping_url = http://landscape.canonical.com/ping\n"
+             % config.data_path)
+
     def test_silent_setup_without_computer_title(self):
         """A computer title is required."""
         sysvconfig_mock = self.mocker.patch(SysVConfig)