Merge lp:~chad.smith/landscape-charm/package-search-threshold-800 into lp:~landscape/landscape-charm/trunk

[Chad Smith]

Set package-search account-threshold back to 800 for landscape-charm until lp:1675569 is resolved.

Set package-search account-threshold back to 800 for landscape-charm until lp:1675569 is resolved.
=
This is a complete revert of lp:landscape-charm rev 372. Just backing out the change that activated package-search on all OnPrem installs (by setting account-threshold = 0).

[🤖 Landscape Builder (landscape-builder)]

review: Abstain (executing tests)

[🤖 Landscape Builder (landscape-builder)]

Command: make ci-test
Result: Success
Revno: 386
Branch: lp:~chad.smith/landscape-charm/package-search-threshold-800
Jenkins: https://ci.lscape.net/job/latch-test-xenial/3774/

review: Approve (test results)

[Adam Collard (adam-collard)]

+1, looks good

review: Approve

[Alberto Donato (ack)]

+1

review: Approve

=== modified file 'lib/tests/test_templates.py'
--- lib/tests/test_templates.py	2016-11-03 11:28:38 +0000
+++ lib/tests/test_templates.py	2017-03-24 21:02:39 +0000
@@ -96,7 +96,7 @@
             "/var/run/landscape/landscape-package-search.pid",
             config.get("package-search", "pid-path"))
         self.assertEqual(
-            "0", config.get("package-search", "account-threshold"))
+            "800", config.get("package-search", "account-threshold"))
 
     def test_render_with_package_search_on_non_leader(self):
         """

=== modified file 'templates/service.conf'
--- templates/service.conf	2016-11-03 11:28:38 +0000
+++ templates/service.conf	2017-03-24 21:02:39 +0000
@@ -109,7 +109,7 @@
 port = 9099
 stores = main package resource-1
 pid-path = /var/run/landscape/landscape-package-search.pid
-account-threshold = 0
+account-threshold = 800
 
 [package-upload]
 stores = main account-1