Merge ~cjwatson/launchpad-layers:turnip-drop-resources into launchpad-layers:main

Proposed by Colin Watson
Status: Merged
Merged at revision: f80d86736c1f0e470aaa83d5bb20836b0a8a3c2e
Proposed branch: ~cjwatson/launchpad-layers:turnip-drop-resources
Merge into: launchpad-layers:main
Diff against target: 33 lines (+2/-7)
2 files modified
dev/null (+0/-5)
turnip-base/config.yaml (+2/-2)
Reviewer Review Type Date Requested Status
Guruprasad Approve
Review via email: mp+445203@code.launchpad.net

Commit message

turnip-base: Drop resource in favour of better Swift defaults

Description of the change

This was only ever for local development convenience, and it's usually much easier to just fetch the resource from Swift. Now that we're trying to upload the charm to Charmhub, having a resource attached to it is an active impediment, because Charmhub doesn't have a good way to deal with optional resources; so just drop it and set defaults for `swift_container_name` and `swift_storage_url` so that things work better out of the box.

To post a comment you must log in.
Revision history for this message
Guruprasad (lgp171188) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/turnip-base/config.yaml b/turnip-base/config.yaml
2index 1919b6d..0b6804d 100644
3--- a/turnip-base/config.yaml
4+++ b/turnip-base/config.yaml
5@@ -59,7 +59,7 @@ options:
6 description: URL for authenticating against Keystone.
7 swift_storage_url:
8 type: string
9- default: ""
10+ default: "https://objectstorage.prodstack4-5.canonical.com/v1/AUTH_539ac956fe03418fb6c184a99e156d85"
11 description: URL for fetching from Swift (for anonymous access).
12 swift_region_name:
13 type: string
14@@ -71,7 +71,7 @@ options:
15 description: Entity that owns resources.
16 swift_container_name:
17 type: string
18- default: ""
19+ default: "turnip-builds"
20 description: Container to put objects in.
21 haproxy_service_options:
22 type: string
23diff --git a/turnip-base/metadata.yaml b/turnip-base/metadata.yaml
24deleted file mode 100644
25index 4913e81..0000000
26--- a/turnip-base/metadata.yaml
27+++ /dev/null
28@@ -1,5 +0,0 @@
29-resources:
30- turnip:
31- type: file
32- filename: turnip.tar.gz
33- description: Turnip code

Subscribers

People subscribed via source and target branches