Skip to content

Commit 6c0437a

Browse files
authored
Merge pull request #457 from SimonRichardson/ensure-charm-store-prefix
#457 The following PR ensures that all the URLs have the correct prefix, that way when we come to implement the charm-hub deployment workflow we do that without breaking the old tests. Eventually the cs: (charm-store) will be removed, but whilst we're in transition, we should still support it and the tests associated with them. The code is very mechanical and should show that a cs: prefix is mandatory if the user wants to contact the charm-store.
2 parents eb849e4 + b7a3cba commit 6c0437a

27 files changed

Lines changed: 1022 additions & 30 deletions

examples/add_machine.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ async def main():
4444

4545
# deploy charm to the lxd container
4646
application = await model.deploy(
47-
'ubuntu-10',
47+
'cs:ubuntu-10',
4848
application_name='ubuntu',
4949
series='xenial',
5050
channel='stable',

examples/add_model.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ async def main():
2929

3030
print('Deploying ubuntu')
3131
application = await model.deploy(
32-
'ubuntu-10',
32+
'cs:ubuntu-10',
3333
application_name='ubuntu',
3434
series='trusty',
3535
channel='stable',

examples/charms/ubuntu/LICENSE

Lines changed: 674 additions & 0 deletions
Large diffs are not rendered by default.

examples/charms/ubuntu/README

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
# Overview
2+
3+
Just an Ubuntu image with not much else running.
4+
5+
# Usage
6+
7+
juju deploy ubuntu-lite
8+
9+
## Known Limitations and Issues
10+
11+
It doesn't do much, but it does get you a machine you can play with, as quickly
12+
as I could make it.
13+
14+
# Configuration
15+
16+
None

examples/charms/ubuntu/config.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
options: {}

examples/charms/ubuntu/hooks/start

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
#!/bin/bash
2+
status-set active ready
3+
application-version-set $(grep DISTRIB_RELEASE /etc/lsb-release | cut -d= -sf2)
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
#!/bin/sh
2+
status-set active "$(uptime | grep -oe 'average: .*' | sed -e 's/average:/load:/')"

examples/charms/ubuntu/icon.svg

Lines changed: 279 additions & 0 deletions
Loading
Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
name: ubuntu-lite
2+
summary: The smallest charm I could come up with that still looks nice.
3+
maintainer: John Arbash Meinel <john@arbash-meinel.com>
4+
description: |
5+
Run an Ubuntu system, but don't do a whole lot else.
6+
series: ["xenial", "bionic", "trusty"]
7+
provides:
8+
ubuntu:
9+
interface: ubuntu
10+
extra-bindings:
11+
another:
12+
tags:
13+
# https://jujucharms.com/docs/stable/authors-charm-metadata
14+
- misc
15+
- application_development
16+
subordinate: false

examples/charms/ubuntu/revision

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
0

0 commit comments

Comments
 (0)