Merge pull request #494 from SimonRichardson/merge-2.9-master

#494

The following merges 2.9 into master.

eed19e4 (upstream/2.9, origin/2.9, 2.9) Merge pull request #492 from tlm/kube-proxy-support-2
ab33f33 Merge pull request #493 from SimonRichardson/remove-machine-workaround
5c2dfa9 Merge pull request #491 from tlm/2.9.1-facades
b24e750 Merge pull request #490 from tlm/kube-proxy-support-2
aaa651c Merge pull request #482 from SimonRichardson/find-parameters
bde724b Merge pull request #481 from SimonRichardson/merge-master-2.9
fa1b85f Merge pull request #464 from SimonRichardson/charm-hub-url
195191b Merge pull request #463 from SimonRichardson/charm-hub-origin
d6d157f Merge pull request #462 from SimonRichardson/charm-hub-find
6fab2ee Merge pull request #460 from SimonRichardson/charm-hub-info
5e61dd2 Merge pull request #459 from SimonRichardson/rename-upgrade-charm-refresh
73604c8 Merge pull request #456 from SimonRichardson/update-schema-2.9-rc3
6c0437a Merge pull request #457 from SimonRichardson/ensure-charm-store-prefix
eb849e4 Merge pull request #455 from SimonRichardson/2.9
1a77394 Merge pull request #449 from achilleasa/support-new-expose-params-for-applications
ad3c449 Merge pull request #448 from achilleasa/gen-2.9-beta-client

Author: jujubot

examples/add_machine.py

@@ -44,7 +44,7 @@ async def main():
 
         # deploy charm to the lxd container
         application = await model.deploy(
-            'ubuntu-10',
+            'cs:ubuntu-10',
             application_name='ubuntu',
             series='xenial',
             channel='stable',

examples/add_model.py

@@ -29,7 +29,7 @@ async def main():
 
         print('Deploying ubuntu')
         application = await model.deploy(
-            'ubuntu-10',
+            'cs:ubuntu-10',
             application_name='ubuntu',
             series='trusty',
             channel='stable',

examples/charmhub_find.py

@@ -0,0 +1,33 @@
+"""
+Example to show how to connect to the current model and search the charm-hub
+repository for charms.
+"""
+import logging
+
+from juju import loop
+from juju.model import Model
+
+log = logging.getLogger(__name__)
+
+
+async def main():
+    model = Model()
+    try:
+        # connect to the current model with the current user, per the Juju CLI
+        await model.connect()
+
+        # do a partial query so that we get more results.
+        charms = await model.charmhub.find("kuber")
+
+        print("Bundle\tName")
+        for resp in charms.result:
+            print("{}\t{}".format("N" if resp.type_ == "charm" else "Y", resp.name))
+    finally:
+        if model.is_connected():
+            print('Disconnecting from model')
+            await model.disconnect()
+
+
+if __name__ == '__main__':
+    logging.basicConfig(level=logging.INFO)
+    loop.run(main())

examples/charmhub_info.py

@@ -0,0 +1,29 @@
+"""
+Example to show how to connect to the current model and query the charm-hub
+repository for information about a given charm.
+"""
+import logging
+
+from juju import loop
+from juju.model import Model
+
+log = logging.getLogger(__name__)
+
+
+async def main():
+    model = Model()
+    try:
+        # connect to the current model with the current user, per the Juju CLI
+        await model.connect()
+
+        charm = await model.charmhub.info("mattermost")
+        print(charm)
+    finally:
+        if model.is_connected():
+            print('Disconnecting from model')
+            await model.disconnect()
+
+
+if __name__ == '__main__':
+    logging.basicConfig(level=logging.INFO)
+    loop.run(main())

examples/charms/ubuntu/LICENSE

@@ -0,0 +1,16 @@
+# Overview
+
+Just an Ubuntu image with not much else running.
+
+# Usage
+
+juju deploy ubuntu-lite
+
+## Known Limitations and Issues
+
+It doesn't do much, but it does get you a machine you can play with, as quickly
+as I could make it.
+
+# Configuration
+
+None

examples/charms/ubuntu/README

@@ -0,0 +1 @@
+options: {}

examples/charms/ubuntu/config.yaml

@@ -0,0 +1,3 @@
+#!/bin/bash
+status-set active ready
+application-version-set $(grep DISTRIB_RELEASE /etc/lsb-release | cut -d= -sf2)

examples/charms/ubuntu/hooks/start

@@ -0,0 +1,2 @@
+#!/bin/sh
+status-set active "$(uptime | grep -oe 'average: .*' | sed -e 's/average:/load:/')"