Merge ~moon127/mojo/+git/mojo-specs:ps5 into ~mojo-maintainers/mojo/+git/mojo-specs:master

[Gareth Woolridge]

mojo-how-to: migrate from deployer configs to bundle and deploy from charmstore directly where possible, for production service migration

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

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

[Tom Haddon (mthaddon)]

LGTM, thx

review: Approve

[Gareth Woolridge (moon127)]

Setting to WIP till we're ready to deploy in PS5, as this is a major change to a public spec, so not one to just land on a Friday afternoon.

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

Change successfully merged at revision c7e5cf7b69cd8cd171c0dd893aafe8c8dd2be329

diff --git a/mojo-how-to/README b/mojo-how-to/README
index 567960e..e8cd984 100644
--- a/mojo-how-to/README
+++ b/mojo-how-to/README
@@ -8,19 +8,13 @@ stage *only*:
 
 This file should contain the following:
 
-mojo-how-to:
-    services:
-        landscape-client:
-            options:
-                registration-key: $YOUR_LANDSCAPE_REGISTRATION_KEY
-                url: "https://${LANDSCAPE_INSTANCE}/message-system"
-                ping-url: "http://${LANDSCAPE_INSTANCE}/ping"
-                account-name: "$LANDSCAPE_ACCOUNT_NAME"
-                tags: "$YOUR_CHOICE_OF_TAGS"
-        ksplice:
-            options:
-                access-key: $YOUR_KSPLICE_ACCESS_KEY
-
+applications:
+  autocert-apache2:
+    options:
+      cert_auth_pairs: $YOUR_CERT_AUTH_PAIRS
+  nrpe:
+    options:
+      nagios_master: $YOUR_NAGIOS_MASTER_HOST
 
 If you are using the autodeploy manifests, you will also need the following in
 a secrets file called "autodeploy-secrets":
diff --git a/mojo-how-to/configs/mojo-how-to-production-vhost-https.template b/mojo-how-to/configs/mojo-how-to-production-vhost-https.template
index f74157c..9ba5e08 100644
--- a/mojo-how-to/configs/mojo-how-to-production-vhost-https.template
+++ b/mojo-how-to/configs/mojo-how-to-production-vhost-https.template
@@ -6,11 +6,9 @@
     ErrorLog /var/log/apache2/{{ servername }}-error.log
 
     SSLEngine On
-    SSLCertificateFile      /etc/ssl/certs/{{ ssl_certlocation }}
-    SSLCertificateKeyFile   /etc/ssl/private/{{ ssl_keylocation }}
-    {% if ssl_chainlocation %}
-    SSLCertificateChainFile /etc/ssl/certs/{{ ssl_chainlocation }}
-    {% endif %}
+    SSLCertificateFile      /etc/ssl/certs/mojo.canonical.com.crt
+    SSLCertificateKeyFile   /etc/ssl/private/mojo.canonical.com.key
+    SSLCertificateChainFile /etc/ssl/certs/mojo.canonical.com_chain.crt
     SSLProtocol all
 
     <Directory /srv/mojo>
diff --git a/mojo-how-to/devel/bundle-relations b/mojo-how-to/devel/bundle-relations
new file mode 100644
index 0000000..c2eaafd
--- /dev/null
+++ b/mojo-how-to/devel/bundle-relations
@@ -0,0 +1,3 @@
+relations:
+  - ["apache2", "content-fetcher"]
+  - ["apache2:nrpe-external-master", "nrpe:nrpe-external-master"]
diff --git a/mojo-how-to/devel/services b/mojo-how-to/devel/bundle-services
similarity index 76%
rename from mojo-how-to/devel/services
rename to mojo-how-to/devel/bundle-services
index 7f569fc..45e45ae 100644
--- a/mojo-how-to/devel/services
+++ b/mojo-how-to/devel/bundle-services
@@ -1,25 +1,23 @@
-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
-            options:
-                nagios_master: nagios1.internal
-            {% if series == "xenial" %}
-                procs: '-w 150 -c 200'
-                swap: '-w 90% -c 75% -n ok'{% endif %}
+series: {{ series }}
+applications:
+  apache2:
+    charm: cs: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: cs:~content-fetcher-charmers/content-fetcher
+    options:
+      archive_location: file:///home/ubuntu/mojo.tar
+      dest_dir: /srv/mojo
+  nrpe:
+    charm: cs:nrpe
+    options:
+      nagios_master: nagios1.internal
+      procs: '-w 150 -c 200'
+      swap: ''
diff --git a/mojo-how-to/devel/collect b/mojo-how-to/devel/collect
index 461c025..95a4363 100644
--- a/mojo-how-to/devel/collect
+++ b/mojo-how-to/devel/collect
@@ -1,8 +1,2 @@
-apache2                 lp:charms/trusty/apache2
-
-# subordinates
-content-fetcher         lp:~mthaddon/charms/trusty/content-fetcher/trunk
-nrpe                    lp:charms/trusty/nrpe
-
 # content to publish
 mojo                    lp:mojo
diff --git a/mojo-how-to/devel/relations b/mojo-how-to/devel/relations
deleted file mode 100644
index 4941d2c..0000000
--- a/mojo-how-to/devel/relations
+++ /dev/null
@@ -1,12 +0,0 @@
-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"]
diff --git a/mojo-how-to/manifest b/mojo-how-to/manifest
index 46e4d05..4dd3e8f 100644
--- a/mojo-how-to/manifest
+++ b/mojo-how-to/manifest
@@ -6,13 +6,11 @@ script config=build
 # Run pre-deploy script
 script config=pre-deploy
 # Deploy services only
-deploy config=services local=services-secret delay=0
+bundle config=bundle-services local=services-secret additional-ready-states=waiting
 # Copy our built resources to the instances
 script config=upload-built-content
 # And now deploy relations as well
-deploy 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
+bundle config=bundle-services,bundle-relations local=services-secret
 # Run verify steps
 include config=manifest-verify
 # Run post deploy steps
diff --git a/mojo-how-to/manifest-golive b/mojo-how-to/manifest-golive
deleted file mode 100644
index e46da16..0000000
--- a/mojo-how-to/manifest-golive
+++ /dev/null
@@ -1,6 +0,0 @@
-## This manifest is intended to be used only once the production environment 
-## is confirmed to be up and running and it will be kept in place. It applies
-## landscape and ksplice relations.
-deploy config=golive
-sleep config=30
-include config=manifest-verify
diff --git a/mojo-how-to/manifest-production b/mojo-how-to/manifest-production
new file mode 100644
index 0000000..342574b
--- /dev/null
+++ b/mojo-how-to/manifest-production
@@ -0,0 +1,19 @@
+# Run the collect step
+collect
+# 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
+bundle config=bundle-services local=services-secret additional-ready-states=waiting
+# Copy our built resources to the instances
+script config=upload-built-content
+# And now deploy relations as well
+bundle config=bundle-services,bundle-relations local=services-secret
+# 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.template HTTPS_TEMPLATE=${MOJO_STAGE}/../configs/mojo-how-to-production-vhost-https.template
+# Run verify steps
+include config=manifest-verify
+# Run post deploy steps
+script config=post-deploy
diff --git a/mojo-how-to/production/bundle-relations b/mojo-how-to/production/bundle-relations
new file mode 100644
index 0000000..236968c
--- /dev/null
+++ b/mojo-how-to/production/bundle-relations
@@ -0,0 +1,6 @@
+series: {{ series }}
+relations:
+  - ["apache2", "content-fetcher"]
+  - ["apache2:nrpe-external-master", "nrpe:nrpe-external-master"]
+  - ['apache2', 'autocert-apache2']
+  - ['autocert-apache2:nrpe-external-master', 'nrpe:nrpe-external-master']
diff --git a/mojo-how-to/production/services b/mojo-how-to/production/bundle-services
similarity index 63%
rename from mojo-how-to/production/services
rename to mojo-how-to/production/bundle-services
index ddf40d7..e6d1d53 100644
--- a/mojo-how-to/production/services
+++ b/mojo-how-to/production/bundle-services
@@ -1,34 +1,33 @@
-mojo-how-to:
-    series: {{ series }}
-    services:
-        apache2:
-            charm: apache2
-            expose: true
-            num_units: 1
-            options:
-                servername: mojo.canonical.com
-                enable_modules: "ssl"
-                nagios_check_http_params: -I 127.0.0.1 -H mojo.canonical.com -S -e '200' -s 'Mojo'
-        autocert-apache2:
-          charm: autocert
-          options:
-            autocert_host: autocert.canonical.com
-            service_action: reload
-            service_name: apache2
-            service_test_cmd: /usr/sbin/apache2ctl configtest
-        content-fetcher:
-            charm: content-fetcher
-            options:
-                archive_location: file:///home/ubuntu/mojo.tar
-                dest_dir: /srv/mojo
-        landscape:
-            charm: landscape-client
-        nrpe:
-            charm: nrpe
-            options:
-                nagios_master: nagios1.internal
-            {% if series == "xenial" %}
-                procs: '-w 200 -c 250'
-                swap: '-w 90% -c 75% -n ok'{% endif %}
-        ksplice:
-            charm: ksplice
+series: {{ series }}
+applications:
+  apache2:
+    charm: cs:apache2
+    expose: true
+    num_units: 1
+    constraints: cpu-cores=2 mem=4G root-disk=20G root-disk-source=volume
+    options:
+      servername: mojo.canonical.com
+      enable_modules: "ssl"
+      nagios_check_http_params: -I 127.0.0.1 -H mojo.canonical.com -S -e '200' -s 'Mojo'
+      nagios_context: prod-mojo-how-to
+  autocert-apache2:
+    charm: cs:~autocert-charmers/autocert
+    options:
+      autocert_host: autocert.canonical.com
+      service_action: reload
+      service_name: apache2
+      service_test_cmd: /usr/sbin/apache2ctl configtest
+      nagios_servicegroups: prod-mojo-how-to
+  content-fetcher:
+    charm: cs:~content-fetcher-charmers/content-fetcher
+    options:
+      archive_location: file:///home/ubuntu/mojo.tar
+      dest_dir: /srv/mojo
+  nrpe:
+    charm: cs:nrpe
+    options:
+      nagios_host_context: prod-mojo-how-to
+      export_nagios_definitions: true
+      procs: '-w 200 -c 250'
+      swap: ''
+      sub_postfix: ''
diff --git a/mojo-how-to/production/collect b/mojo-how-to/production/collect
index ad2760d..95a4363 100644
--- a/mojo-how-to/production/collect
+++ b/mojo-how-to/production/collect
@@ -1,19 +1,2 @@
-apache2                 lp:charms/trusty/apache2
-ubuntu                  lp:~canonical-sysadmins/charms/trusty/ubuntu/trunk
-
-
-# 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 to publish
 mojo                    lp:mojo
diff --git a/mojo-how-to/production/golive b/mojo-how-to/production/golive
deleted file mode 100644
index 4b993ca..0000000
--- a/mojo-how-to/production/golive
+++ /dev/null
@@ -1,17 +0,0 @@
-mojo-how-to:
-    series: {{ series }}
-    services:
-        apache2:
-            charm: apache2
-        content-fetcher:
-            charm: content-fetcher
-        nrpe:
-            charm: nrpe
-        landscape:
-            charm: landscape-client
-        ksplice:
-            charm: ksplice
-    relations:
-        - ["apache2", "nrpe"]
-        - ["apache2", "landscape"]
-        - ["apache2", "ksplice"]
diff --git a/mojo-how-to/production/post-deploy b/mojo-how-to/production/post-deploy
index 1cb8fbd..b4eee67 100755
--- a/mojo-how-to/production/post-deploy
+++ b/mojo-how-to/production/post-deploy
@@ -7,5 +7,5 @@ PRODUCTION_IP_1="162.213.33.51"
 
 SERVER_1=$(juju status --format yaml |awk '$1 == "instance-id:" {print $2}')
 
-echo "Running nova floating-ip-associate ${SERVER_1} ${PRODUCTION_IP_1}"
-nova floating-ip-associate ${SERVER_1} ${PRODUCTION_IP_1}
+echo "Running openstack server add floating ip ${SERVER_1} ${PRODUCTION_IP_1}"
+openstack server add floating ip ${SERVER_1} ${PRODUCTION_IP_1}
diff --git a/mojo-how-to/production/relations b/mojo-how-to/production/relations
deleted file mode 100644
index 396073b..0000000
--- a/mojo-how-to/production/relations
+++ /dev/null
@@ -1,20 +0,0 @@
-mojo-how-to:
-    series: {{ series }}
-    services:
-        apache2:
-            charm: apache2
-        autocert-apache2:
-            charm: autocert
-        content-fetcher:
-            charm: content-fetcher
-        nrpe:
-            charm: nrpe
-        landscape:
-            charm: landscape-client
-        ksplice:
-            charm: ksplice
-    relations:
-        - ["apache2", "content-fetcher"]
-        - ["apache2:nrpe-external-master", "nrpe:nrpe-external-master"]
-        - ['apache2', 'autocert-apache2']
-        - ['autocert-apache2:nrpe-external-master', 'nrpe:nrpe-external-master']