Merge lp:~mthaddon/mojo/mojo-how-to-focal into lp:mojo/mojo-specs

[Tom Haddon]

mojo-how-to: switch to focal and bundles

mojo-how-to: switch to focal and bundles

[lp:~mthaddon/mojo/mojo-how-to-focal]

163. By Tom Haddon on 2020-02-25

Update autocert to not run in devel

164. By Tom Haddon on 2020-02-25

Fix template location for production

165. By Tom Haddon on 2020-02-25

Fix up location of http templates

166. By Tom Haddon on 2020-02-25

Don't try to set the vhost config twice in devel

Unmerged revisions

166. By Tom Haddon on 2020-02-25

Don't try to set the vhost config twice in devel

165. By Tom Haddon on 2020-02-25

Fix up location of http templates

164. By Tom Haddon on 2020-02-25

Fix template location for production

163. By Tom Haddon on 2020-02-25

Update autocert to not run in devel

162. By Tom Haddon on 2020-02-25

Don't overwrite apache config in devel phase with secrets

161. By Tom Haddon on 2020-02-25

Use the plural of application in bundles

160. By Tom Haddon on 2020-02-25

Secrets file needs at least one application specified

159. By Tom Haddon on 2020-02-25

Use local config for services-secret

158. By Tom Haddon on 2020-02-25

Switch to upstream apache2 charm now it supports focal as well

157. By Tom Haddon on 2020-02-20

mojo-how-to: prep for focal, switch to bundles

=== modified file 'mojo-how-to/devel/build'
--- mojo-how-to/devel/build	2020-01-15 09:58:51 +0000
+++ mojo-how-to/devel/build	2020-02-25 15:42:42 +0000
@@ -18,8 +18,5 @@
     # We don't deploy landscape in non-production environments, but we need a
     # dummy secrets file
     echo "Creating dummy services-secret file in ${MOJO_LOCAL_DIR}"
-    echo "mojo-how-to:
-    services:
-        nrpe:
-            charm: nrpe" > ${MOJO_LOCAL_DIR}/services-secret
+    echo "series: ${MOJO_SERIES}" > ${MOJO_LOCAL_DIR}/services-secret
 fi

=== modified file 'mojo-how-to/devel/collect'
--- mojo-how-to/devel/collect	2016-03-30 10:00:49 +0000
+++ mojo-how-to/devel/collect	2020-02-25 15:42:42 +0000
@@ -1,8 +1,8 @@
-apache2                 lp:charms/trusty/apache2
+apache2                 cs:apache2
 
 # subordinates
-content-fetcher         lp:~mthaddon/charms/trusty/content-fetcher/trunk
-nrpe                    lp:charms/trusty/nrpe
+content-fetcher         cs:~mthaddon/content-fetcher
+nrpe                    cs:nrpe
 
 # content to publish
 mojo                    lp:mojo

=== removed file 'mojo-how-to/devel/pre-deploy'
=== modified file 'mojo-how-to/devel/relations'
--- mojo-how-to/devel/relations	2016-03-30 10:00:49 +0000
+++ mojo-how-to/devel/relations	2020-02-25 15:42:42 +0000
@@ -1,12 +1,25 @@
-mojo-how-to:
-    series: {{ series }}
-    services:
-        apache2:
-            charm: apache2
-        content-fetcher:
-            charm: content-fetcher
-        nrpe:
-            charm: nrpe
-    relations:
-        - ["apache2", "content-fetcher"]
-        - ["apache2:nrpe-external-master", "nrpe:nrpe-external-master"]
+series: {{ series }}
+applications:
+    apache2:
+        charm: {{ charm_dir }}/apache2
+        expose: true
+        num_units: 1
+        options:
+            servername: mojo-how-to.example.com
+            enable_modules: "ssl"
+            nagios_check_http_params: "-I 127.0.0.1 -H mojo-how-to-example.com -e '200' -s 'Mojo'"
+            vhost_http_template: 'include-base64://{{spec_dir}}/{{stage}}/../configs/mojo-how-to-vhost-http.template'
+            ssl_cert: SELFSIGNED
+    content-fetcher:
+        charm: {{ charm_dir }}/content-fetcher
+        options:
+            archive_location: file:///home/ubuntu/mojo.tar
+            dest_dir: /srv/mojo
+    nrpe:
+        charm: {{ charm_dir }}/nrpe
+        options:
+            procs: '-w 150 -c 200'
+            swap: '-w 90% -c 75% -n ok'
+relations:
+    - ["apache2", "content-fetcher"]
+    - ["apache2:nrpe-external-master", "nrpe:nrpe-external-master"]

=== modified file 'mojo-how-to/devel/services'
--- mojo-how-to/devel/services	2016-03-30 10:00:49 +0000
+++ mojo-how-to/devel/services	2020-02-25 15:42:42 +0000
@@ -1,23 +1,20 @@
-mojo-how-to:
-    series: {{ series }}
-    services:
-        apache2:
-            charm: apache2
-            expose: true
-            num_units: 1
-            options:
-                servername: mojo-how-to.example.com
-                enable_modules: "ssl"
-                nagios_check_http_params: "-I 127.0.0.1 -H mojo-how-to-example.com -e '200' -s 'Mojo'"
-                vhost_http_template: 'include-base64://{{spec_dir}}/{{stage}}/../configs/mojo-how-to-vhost-http.template'
-                ssl_cert: SELFSIGNED
-        content-fetcher:
-            charm: content-fetcher
-            options:
-                archive_location: file:///home/ubuntu/mojo.tar
-                dest_dir: /srv/mojo
-        nrpe:
-            charm: nrpe
-            {% if series == "xenial" %}options:
-                procs: '-w 150 -c 200'
-                swap: '-w 90% -c 75% -n ok'{% endif %}
+series: {{ series }}
+applications:
+    apache2:
+        charm: {{ charm_dir }}/apache2
+        expose: true
+        num_units: 1
+        options:
+            servername: mojo-how-to.example.com
+            nagios_check_http_params: "-I 127.0.0.1 -H mojo-how-to-example.com -e '200' -s 'Mojo'"
+            vhost_http_template: 'include-base64://{{spec_dir}}/{{stage}}/../configs/mojo-how-to-vhost-http.template'
+    content-fetcher:
+        charm: {{ charm_dir }}/content-fetcher
+        options:
+            archive_location: file:///home/ubuntu/mojo.tar
+            dest_dir: /srv/mojo
+    nrpe:
+        charm: {{ charm_dir }}/nrpe
+        options:
+            procs: '-w 150 -c 200'
+            swap: '-w 90% -c 75% -n ok'

=== modified file 'mojo-how-to/manifest'
--- mojo-how-to/manifest	2020-01-15 08:25:40 +0000
+++ mojo-how-to/manifest	2020-02-25 15:42:42 +0000
@@ -3,16 +3,14 @@
 # We need the markdown package to be able to generate the docs for Mojo
 # Run the build step
 script config=build
-# Run pre-deploy script
-script config=pre-deploy
 # Deploy services only
-deploy config=services local=services-secret delay=0
+bundle config=services local=services-secret
 # Copy our built resources to the instances
 script config=upload-built-content
 # And now deploy relations as well
-deploy config=relations
+bundle config=relations
 # Configure deploy autocert managed apache2
-script config=scripts/utils/configure-apache2-vhosts-autocert APPLICATION=apache2 HTTP_TEMPLATE=${MOJO_STAGE}/../configs//mojo-how-to-production-vhost-http.tmpl HTTPS_TEMPLATE=${MOJO_STAGE}/../configs//mojo-how-to-production-vhost-https.tmpl
+script config=scripts/utils/configure-apache2-vhosts-autocert APPLICATION=apache2
 # Run verify steps
 include config=manifest-verify
 # Run post deploy steps

=== modified file 'mojo-how-to/production/collect'
--- mojo-how-to/production/collect	2019-02-04 04:28:17 +0000
+++ mojo-how-to/production/collect	2020-02-25 15:42:42 +0000
@@ -1,19 +1,10 @@
-apache2                 lp:charms/trusty/apache2
-ubuntu                  lp:~canonical-sysadmins/charms/trusty/ubuntu/trunk
+apache2                 cs:apache2
 
 
 # subordinates
 autocert                cs:~autocert-charmers/autocert
-content-fetcher         lp:~mthaddon/charms/trusty/content-fetcher/trunk
-nrpe                    lp:charms/trusty/nrpe
-landscape-client        cs:{{ series }}/landscape-client
-ksplice                 lp:~anthony-fappiano/charms/trusty/ksplice/trunk
-
-# basenode
-apache2/exec.d          @
-apache2/exec.d/basenode lp:~canonical-sysadmins/basenode/trunk
-ubuntu/exec.d           @
-ubuntu/exec.d/basenode  lp:~canonical-sysadmins/basenode/trunk
+content-fetcher         cs:~content-fetcher
+nrpe                    cs:nrpe
 
 # content to publish
 mojo                    lp:mojo

=== removed symlink 'mojo-how-to/production/pre-deploy'
=== target was '../devel/pre-deploy'
=== modified file 'mojo-how-to/scripts/utils/configure-apache2-vhosts-autocert'
--- mojo-how-to/scripts/utils/configure-apache2-vhosts-autocert	2019-02-04 07:38:29 +0000
+++ mojo-how-to/scripts/utils/configure-apache2-vhosts-autocert	2020-02-25 15:42:42 +0000
@@ -2,16 +2,18 @@
 
 set -eu
 
-if [ -z "${HTTP_TEMPLATE:-}" ]; then
-    HTTP_TEMPLATE="${MOJO_STAGE}/templates/vhost-http.tmpl"
-fi
-
-if [ -z "${HTTPS_TEMPLATE:-}" ]; then
-    HTTPS_TEMPLATE="${MOJO_STAGE}/templates/vhost-https.tmpl"
-fi
+if [ ${MOJO_STAGE##*/} != "production" ]; then
+    # We've already set our vhost config, so just exit
+    exit 0
+fi
+
+HTTP_TEMPLATE="${MOJO_STAGE}/../configs/mojo-how-to-production-vhost-http.template"
+HTTPS_TEMPLATE="${MOJO_STAGE}/../configs/mojo-how-to-production-vhost-https.template"
+
+JUJU_VERSION=$(juju version)
 
 echo "Checking Juju version..."
-case $(juju version) in
+case ${JUJU_VERSION} in
   1.*)
     juju_get="juju get"
     juju_set="juju set"
@@ -23,7 +25,7 @@
     juju_run='juju run --application'
     ;;
   *)
-    echo "Unknown Juju version $(juju version) detected!  Exiting." >&2
+    echo "Unknown Juju version ${JUJU_VERSION} detected!  Exiting." >&2
     exit 1
     ;;
 esac