Merge lp:~mthaddon/mojo/mojo-specs into lp:mojo/mojo-specs

[Tom Haddon]

Some updates to the mojo.canonical.com spec based on SREcon testing and fix the devel stage to not error out with lack of secrets directory.

[lp:~mthaddon/mojo/mojo-specs]

58. By Tom Haddon on 2015-05-21

Comment about ensuring secrets dir

59. By Tom Haddon on 2015-05-21

We can't rely on permissions on the parent of the secrets directory, so just rely on that having been created (will need documenting)

60. By Tom Haddon on 2015-05-21

Remove the secrets phase to avoid it being needed in devel

61. By Tom Haddon on 2015-05-21

Explain what we're doing in creating the dummy service-secrets file

62. By Tom Haddon on 2015-05-21

Typo in the services-secret filename

[Tom Haddon (mthaddon)]

I've made a few more changes, but now confirmed it runs without error.

[Gareth Woolridge (moon127)]

LGTM

review: Approve

=== modified file 'mojo-how-to/README'
--- mojo-how-to/README	2015-01-21 17:46:38 +0000
+++ mojo-how-to/README	2015-05-21 09:55:12 +0000
@@ -4,7 +4,7 @@
 This service requires the following secrets file if deploying the "production"
 stage *only*:
     
-    /srv/mojo/LOCAL/${MOJO_PROJECT}/${MOJO_STAGE}/landscape
+    /srv/mojo/LOCAL/${MOJO_PROJECT}/${MOJO_STAGE}/services-secret
 
 This file should contain the following:
 
@@ -17,3 +17,6 @@
                 ping-url: "http://${LANDSCAPE_INSTANCE}/ping"
                 account-name: "$LANDSCAPE_ACCOUNT_NAME"
                 tags: "$YOUR_CHOICE_OF_TAGS"
+        ksplice:
+            options:
+                access-key: $YOUR_KSPLICE_ACCESS_KEY

=== modified file 'mojo-how-to/configs/mojo-how-to-production-vhost-http.template'
--- mojo-how-to/configs/mojo-how-to-production-vhost-http.template	2015-01-21 15:47:48 +0000
+++ mojo-how-to/configs/mojo-how-to-production-vhost-http.template	2015-05-21 09:55:12 +0000
@@ -8,26 +8,3 @@
     Redirect permanent / https://{{servername}}
 
 </VirtualHost>
-
-<VirtualHost *:443>
-
-    ServerName {{ servername }}
-
-    CustomLog /var/log/apache2/{{ servername }}-access.log combined
-    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 %}
-    SSLProtocol all
-
-    <Directory /srv/mojo>
-        Require all granted
-    </Directory>
-
-    DocumentRoot /srv/mojo
-
-</VirtualHost>

=== added file 'mojo-how-to/configs/mojo-how-to-production-vhost-https.template'
--- mojo-how-to/configs/mojo-how-to-production-vhost-https.template	1970-01-01 00:00:00 +0000
+++ mojo-how-to/configs/mojo-how-to-production-vhost-https.template	2015-05-21 09:55:12 +0000
@@ -0,0 +1,22 @@
+<VirtualHost *:443>
+
+    ServerName {{ servername }}
+
+    CustomLog /var/log/apache2/{{ servername }}-access.log combined
+    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 %}
+    SSLProtocol all
+
+    <Directory /srv/mojo>
+        Require all granted
+    </Directory>
+
+    DocumentRoot /srv/mojo
+
+</VirtualHost>

=== modified file 'mojo-how-to/devel/build'
--- mojo-how-to/devel/build	2015-01-26 10:31:58 +0000
+++ mojo-how-to/devel/build	2015-05-21 09:55:12 +0000
@@ -10,10 +10,11 @@
 tar cvpf ${MOJO_LOCAL_DIR}/mojo.tar --directory=docs/www .
 
 if [ ${MOJO_STAGE##*/} != "production" ]; then
-    # We don't deploy landscape in non-production environments, but we need an
+    # 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-external-master" > ${MOJO_LOCAL_DIR}/landscape
+            charm: nrpe-external-master" > ${MOJO_LOCAL_DIR}/services-secret
 fi

=== added file 'mojo-how-to/devel/post-deploy'
--- mojo-how-to/devel/post-deploy	1970-01-01 00:00:00 +0000
+++ mojo-how-to/devel/post-deploy	2015-05-21 09:55:12 +0000
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+# Nothing to do here
+exit 0

=== added file 'mojo-how-to/devel/pre-deploy'
--- mojo-how-to/devel/pre-deploy	1970-01-01 00:00:00 +0000
+++ mojo-how-to/devel/pre-deploy	2015-05-21 09:55:12 +0000
@@ -0,0 +1,7 @@
+#!/bin/bash
+
+JUJU_STATUS=$(juju status > /dev/null 2>&1)
+if [ $? != 0 ]; then
+    echo "Bootstrapping juju"
+    juju bootstrap
+fi

=== removed file 'mojo-how-to/devel/repo'
--- mojo-how-to/devel/repo	2015-01-21 11:20:06 +0000
+++ mojo-how-to/devel/repo	1970-01-01 00:00:00 +0000
@@ -1,3 +0,0 @@
-apache2
-content-fetcher
-nrpe-external-master

=== modified file 'mojo-how-to/devel/services'
--- mojo-how-to/devel/services	2015-01-26 14:03:14 +0000
+++ mojo-how-to/devel/services	2015-05-21 09:55:12 +0000
@@ -10,6 +10,7 @@
                 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:

=== added file 'mojo-how-to/devel/update-content'
--- mojo-how-to/devel/update-content	1970-01-01 00:00:00 +0000
+++ mojo-how-to/devel/update-content	2015-05-21 09:55:12 +0000
@@ -0,0 +1,12 @@
+#!/bin/bash
+
+if [ "$BUILD_LABEL" = "revno" ]; then
+    DESTINATION="mojo-$(bzr revno ${MOJO_BUILD_DIR}/mojo).tar"
+else
+    DESTINATION="mojo.tar"
+fi
+
+set -e
+set -u
+
+juju set content-fetcher archive_location="file:///home/ubuntu/${DESTINATION}"

=== modified file 'mojo-how-to/devel/upload-built-content'
--- mojo-how-to/devel/upload-built-content	2015-01-21 13:27:31 +0000
+++ mojo-how-to/devel/upload-built-content	2015-05-21 09:55:12 +0000
@@ -1,6 +1,12 @@
 #!/bin/bash
 
+if [ "$BUILD_LABEL" = "revno" ]; then
+    DESTINATION="mojo-$(bzr revno ${MOJO_BUILD_DIR}/mojo).tar"
+else
+    DESTINATION="mojo.tar"
+fi
+
 set -e
 set -u
 
-juju scp ${MOJO_LOCAL_DIR}/mojo.tar apache2/0:
+juju scp ${MOJO_LOCAL_DIR}/mojo.tar apache2/0:${DESTINATION}

=== modified file 'mojo-how-to/manifest'
--- mojo-how-to/manifest	2015-01-26 10:44:40 +0000
+++ mojo-how-to/manifest	2015-05-21 09:55:12 +0000
@@ -4,15 +4,15 @@
 collect
 # Run the build step
 build
-# Create our charm repository
-repo
-# Pull in any secrets - this is only used in the production stage
-secrets
+# Run pre-deploy script
+script config=pre-deploy
 # Deploy services only
-deploy config=services local=landscape
+deploy config=services local=services-secret delay=0
 # Copy our built resources to the instances
 script config=upload-built-content
 # And now deploy relations as well
 deploy config=relations
 # Run verify steps
 include config=manifest-verify
+# Run post deploy steps
+script config=post-deploy

=== added file 'mojo-how-to/manifest-update-content'
--- mojo-how-to/manifest-update-content	1970-01-01 00:00:00 +0000
+++ mojo-how-to/manifest-update-content	2015-05-21 09:55:12 +0000
@@ -0,0 +1,12 @@
+# Pull down the latest content
+collect
+# Run the build step
+build
+# Copy our built resources to the instances
+script config=upload-built-content BUILD_LABEL=revno
+# Update the config variable so our content is updated
+script config=update-content BUILD_LABEL=revno
+# Sleep to let the update be applied
+sleep config=60
+# Check the service again
+include config=manifest-verify

=== modified file 'mojo-how-to/production/collect'
--- mojo-how-to/production/collect	2015-01-26 11:16:10 +0000
+++ mojo-how-to/production/collect	2015-05-21 09:55:12 +0000
@@ -4,6 +4,7 @@
 content-fetcher         lp:~gnuoy/charms/precise/content-fetcher/trunk
 nrpe-external-master    lp:charms/precise/nrpe-external-master
 landscape-client        lp:charms/trusty/landscape-client
+ksplice                 lp:~anthony-fappiano/charms/trusty/ksplice/trunk
 
 # basenode
 apache2/exec.d          @

=== added file 'mojo-how-to/production/post-deploy'
--- mojo-how-to/production/post-deploy	1970-01-01 00:00:00 +0000
+++ mojo-how-to/production/post-deploy	2015-05-21 09:55:12 +0000
@@ -0,0 +1,15 @@
+#!/bin/bash
+
+set -e
+set -u
+
+PRODUCTION_IP_1="162.213.32.109"
+PRODUCTION_IP_2="162.213.32.110"
+
+SERVER_1=$(nova list | grep ${JUJU_ENV} | grep machine-1 | awk '{print $2}')
+SERVER_2=$(nova list | grep ${JUJU_ENV} | grep machine-2 | awk '{print $2}')
+
+echo "Running nova floating-ip-associate ${SERVER_1} ${PRODUCTION_IP_1}"
+nova floating-ip-associate ${SERVER_1} ${PRODUCTION_IP_1}
+echo "Running nova floating-ip-associate ${SERVER_2} ${PRODUCTION_IP_2}"
+nova floating-ip-associate ${SERVER_2} ${PRODUCTION_IP_2}

=== added symlink 'mojo-how-to/production/pre-deploy'
=== target is u'../devel/pre-deploy'
=== modified symlink 'mojo-how-to/production/relations'
=== target was u'../devel/relations'
--- mojo-how-to/production/relations	1970-01-01 00:00:00 +0000
+++ mojo-how-to/production/relations	2015-05-21 09:55:12 +0000
@@ -0,0 +1,18 @@
+mojo-how-to:
+    series: {{ series }}
+    services:
+        apache2:
+            charm: apache2
+        content-fetcher:
+            charm: content-fetcher
+        nrpe:
+            charm: nrpe-external-master
+        landscape:
+            charm: landscape-client
+        ksplice:
+            charm: ksplice
+    relations:
+        - ["apache2", "content-fetcher"]
+        - ["apache2", "nrpe"]
+        - ["apache2", "landscape"]
+        - ["apache2", "ksplice"]

=== removed file 'mojo-how-to/production/repo'
--- mojo-how-to/production/repo	2015-01-21 17:46:38 +0000
+++ mojo-how-to/production/repo	1970-01-01 00:00:00 +0000
@@ -1,4 +0,0 @@
-apache2
-content-fetcher
-landscape-client
-nrpe-external-master

=== modified file 'mojo-how-to/production/services'
--- mojo-how-to/production/services	2015-01-21 17:46:38 +0000
+++ mojo-how-to/production/services	2015-05-21 09:55:12 +0000
@@ -10,11 +10,13 @@
                 enable_modules: "ssl"
                 nagios_check_http_params: -I 127.0.0.1 -H mojo.canonical.com -S -e '200' -s 'Mojo'
                 vhost_http_template: 'include-base64://{{spec_dir}}/{{stage}}/../configs/mojo-how-to-production-vhost-http.template'
+                vhost_https_template: 'include-base64://{{spec_dir}}/{{stage}}/../configs/mojo-how-to-production-vhost-https.template'
                 ssl_key: include-base64://{{local_dir}}/mojo.canonical.com.key
                 ssl_keylocation: mojo.canonical.com.key
                 ssl_cert: include-base64://{{local_dir}}/mojo.canonical.com.crt
                 ssl_certlocation: mojo.canonical.com.crt
                 ssl_chain: include-base64://{{local_dir}}/godaddy_issuing.crt
+                ssl_chainlocation: godaddy_issuing.crt
         content-fetcher:
             charm: content-fetcher
             options:
@@ -24,3 +26,5 @@
             charm: landscape-client
         nrpe:
             charm: nrpe-external-master
+        ksplice:
+            charm: ksplice

=== added symlink 'mojo-how-to/production/update-content'
=== target is u'../devel/update-content'
=== modified file 'mojo-how-to/production/upload-built-content'
--- mojo-how-to/production/upload-built-content	2015-01-21 13:27:31 +0000
+++ mojo-how-to/production/upload-built-content	2015-05-21 09:55:12 +0000
@@ -1,7 +1,13 @@
 #!/bin/bash
 
+if [ "$BUILD_LABEL" = "revno" ]; then
+    DESTINATION="mojo-$(bzr revno ${MOJO_BUILD_DIR}/mojo).tar"
+else
+    DESTINATION="mojo.tar"
+fi
+
 set -e
 set -u
 
-juju scp ${MOJO_LOCAL_DIR}/mojo.tar apache2/0:
-juju scp ${MOJO_LOCAL_DIR}/mojo.tar apache2/1:
+juju scp ${MOJO_LOCAL_DIR}/mojo.tar apache2/0:${DESTINATION}
+juju scp ${MOJO_LOCAL_DIR}/mojo.tar apache2/1:${DESTINATION}