Merge ~mthaddon/charm-k8s-discourse/+git/charm-k8s-discourse:readme into charm-k8s-discourse:master

Proposed by Tom Haddon
Status: Merged
Approved by: Tom Haddon
Approved revision: 2392e86d8bafc596729bd2c170c5b8655d10fbc7
Merged at revision: 0f9efe99f5bf8cb1e3cff0c1a60a7daab8e6cfb1
Proposed branch: ~mthaddon/charm-k8s-discourse/+git/charm-k8s-discourse:readme
Merge into: charm-k8s-discourse:master
Diff against target: 73 lines (+21/-10)
1 file modified
README.md (+21/-10)
Reviewer Review Type Date Requested Status
Laurent Sesquès Approve
Canonical IS Reviewers Pending
Review via email: mp+394937@code.launchpad.net

Commit message

Update README to be more end-user focused, showing initial deployment steps up front

Description of the change

Update README to be more end-user focused, showing initial deployment steps up front

To post a comment you must log in.
Revision history for this message
🤖 Canonical IS Merge Bot (canonical-is-mergebot) wrote :

This merge proposal is being monitored by mergebot. Change the status to Approved to merge.

Revision history for this message
Laurent Sesquès (sajoupa) :
review: Approve
Revision history for this message
🤖 Canonical IS Merge Bot (canonical-is-mergebot) wrote :

Change successfully merged at revision 0f9efe99f5bf8cb1e3cff0c1a60a7daab8e6cfb1

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/README.md b/README.md
2index fcaa8ea..0167267 100644
3--- a/README.md
4+++ b/README.md
5@@ -11,11 +11,22 @@ cloud, attached to a controller using `juju add-k8s`.
6
7 ## Usage
8
9-See config option descriptions in config.yaml.
10+To get started with a test environment, first deploy Redis in an IaaS model:
11
12-After deploying this charm, you will need to create a relation to a PostgreSQL
13-database to provide backend storage for Discourse. You will also need to
14-deploy Redis and set your configuration to point to it.
15+ juju deploy cs:~redis-charmers/redis # Note the deployed IP as ${REDIS_IP}
16+
17+Now deploy the Discourse and PostgreSQL charms within a Juju Kubernetes model
18+as follows:
19+
20+ juju deploy cs:~postgresql-charmers/postgresql-k8s postgresql
21+ juju deploy cs:~discourse-charmers/discourse-k8s discourse \
22+ --config redis_host=${REDIS_IP} \
23+ --config developer_emails="user@foo.internal" \
24+ --config external_hostname="foo.internal" \
25+ --config smtp_address="127.0.0.1" \
26+ --config smtp_domain="foo.internal"
27+ juju add-relation discourse postgresql:db-admin
28+ juju expose discourse
29
30 ### Static content and uploads
31
32@@ -30,7 +41,7 @@ local storage.
33
34 ### Developing
35
36-Notes for deploying a test setup locally using microk8s:
37+Notes for deploying a test setup locally using MicroK8s:
38
39 sudo snap install juju --classic
40 sudo snap install juju-wait --classic
41@@ -57,11 +68,11 @@ Notes for deploying a test setup locally using microk8s:
42 juju status
43
44 The charm will not function without a database, so you will need to
45-deploy `cs:postgresql` somewhere. You will also need a redis application
46+deploy `cs:postgresql` somewhere. You will also need a Redis application
47 to connect to, such as `cs:~redis-charmers/redis`.
48
49-If postgresql is deployed in the same model you plan to use for
50-discourse, simply use `juju relate discourse postgresql:db`. (This
51+If PostgreSQL is deployed in the same model you plan to use for
52+Discourse, simply use `juju relate discourse postgresql:db-admin`. (This
53 deployment style is recommended for testing purposes only.)
54
55 Cross-model relations are also supported. Create a suitable model on
56@@ -70,7 +81,7 @@ a different cloud, for example, LXD or OpenStack.
57 juju switch database
58 juju deploy cs:postgresql
59 juju deploy cs:~redis-charmers/redis # Use the IP address for the `redis_host` config option to discourse
60- juju offer postgresql:db
61+ juju offer postgresql:db-admin
62
63 In most k8s deployments, traffic to external services from worker pods
64 will be SNATed by some part of the infrastructure. You will need to
65@@ -80,7 +91,7 @@ know what the source addresses or address range is for the next step.
66 juju find-offers # note down offer URL; example used below:
67 juju relate discourse admin/database.postgresql --via 10.9.8.0/24
68
69-(In the case of postgresql, `--via` is needed so that the charm can
70+(In the case of PostgreSQL, `--via` is needed so that the charm can
71 configure `pga_hba.conf` to let the k8s pods connect to the database.)
72
73 ## Testing

Subscribers

People subscribed via source and target branches