Updates Wordpress example

examples/wordpress/README.md

@@ -32,6 +32,12 @@ resources:
 ### Privileged containers
 To use NFS we need to be able to launch privileged containers. If your Kubernetes cluster doesn't support this you can either manually change this in every Kubernetes minion or you could set the flag at `kubernetes/saltbase/pillar/privilege.sls` to true and (re)launch your Kubernetes cluster. Once Kubernetes 1.1 releases this should be enabled by default.
 
+### NFS Library
+Currently the nfs-common library should be installed by default on Kubernetes nodes. In case nfs-common is not installed you can install it on all Kubernetes nodes using the following command:
+```
+gcloud compute instances list | cut -d ' ' -f 1 | tail -n +2 | xargs -n1 gcloud compute ssh --command="sudo apt-get update;sudo apt-get -y install nfs-common"
+```
+
 
 ## Understanding the Wordpress example template
 
@@ -43,23 +49,20 @@ Let's take a closer look at the template used by the Wordpress example. The Word
 The template contains the following variables:
 
 ```
-{% set PROJECT = properties['project'] or 'dm-k8s-testing' %}
-{% set NFS_SERVER = properties['nfs-server'] or {} %}
+{% set PROPERTIES = properties or {} %}
+{% set PROJECT = PROPERTIES['project'] or 'dm-k8s-testing' %}
+{% set NFS_SERVER = PROPERTIES['nfs-server'] or {} %}
 {% set NFS_SERVER_IP = NFS_SERVER['ip'] or '10.0.253.247' %}
 {% set NFS_SERVER_PORT = NFS_SERVER['port'] or 2049 %}
 {% set NFS_SERVER_DISK = NFS_SERVER['disk'] or 'nfs-disk' %}
 {% set NFS_SERVER_DISK_FSTYPE = NFS_SERVER['fstype'] or 'ext4' %}
-{% set NGINX = properties['nginx'] or {} %}
+{% set NGINX = PROPERTIES['nginx'] or {} %}
 {% set NGINX_PORT = 80 %}
 {% set NGINX_REPLICAS = NGINX['replicas'] or 2 %}
-{% set WORDPRESS_PHP = properties['wordpress-php'] or {} %}
+{% set WORDPRESS_PHP = PROPERTIES['wordpress-php'] or {} %}
 {% set WORDPRESS_PHP_REPLICAS = WORDPRESS_PHP['replicas'] or 2 %}
 {% set WORDPRESS_PHP_PORT = WORDPRESS_PHP['port'] or 9000 %}
-{% set MYSQL = properties['mysql'] or {} %}
-{% set MYSQL_PORT = MYSQL['port'] or 3306 %}
-{% set MYSQL_PASSWORD = MYSQL['password'] or 'mysql-password' %}
-{% set MYSQL_DISK = MYSQL['disk'] or 'mysql-disk' %}
-{% set MYSQL_DISK_FSTYPE = MYSQL['fstype'] or 'ext4' %}
+{% set MYSQL = PROPERTIES['mysql'] or {} %}                                                                                                                                                                                                                                 {% set MYSQL_PORT = MYSQL['port'] or 3306 %}                                                                                                                                                                                                                                {% set MYSQL_PASSWORD = MYSQL['password'] or 'mysql-password' %}                                                                                                                                                                                                            {% set MYSQL_DISK = MYSQL['disk'] or 'mysql-disk' %}                                                                                                                                                                                                                        {% set MYSQL_DISK_FSTYPE = MYSQL['fstype'] or 'ext4' %}
 ```
 
 ### Nginx service

examples/wordpress/wordpress.jinja

@@ -1,16 +1,17 @@
-{% set PROJECT = properties['project'] or 'dm-k8s-testing' %}
-{% set NFS_SERVER = properties['nfs-server'] or {} %}
+{% set PROPERTIES = properties or {} %}
+{% set PROJECT = PROPERTIES['project'] or 'dm-k8s-testing' %}
+{% set NFS_SERVER = PROPERTIES['nfs-server'] or {} %}
 {% set NFS_SERVER_IP = NFS_SERVER['ip'] or '10.0.253.247' %}
 {% set NFS_SERVER_PORT = NFS_SERVER['port'] or 2049 %}
 {% set NFS_SERVER_DISK = NFS_SERVER['disk'] or 'nfs-disk' %}
 {% set NFS_SERVER_DISK_FSTYPE = NFS_SERVER['fstype'] or 'ext4' %}
-{% set NGINX = properties['nginx'] or {} %}
+{% set NGINX = PROPERTIES['nginx'] or {} %}
 {% set NGINX_PORT = 80 %}
 {% set NGINX_REPLICAS = NGINX['replicas'] or 2 %}
-{% set WORDPRESS_PHP = properties['wordpress-php'] or {} %}
+{% set WORDPRESS_PHP = PROPERTIES['wordpress-php'] or {} %}
 {% set WORDPRESS_PHP_REPLICAS = WORDPRESS_PHP['replicas'] or 2 %}
 {% set WORDPRESS_PHP_PORT = WORDPRESS_PHP['port'] or 9000 %}
-{% set MYSQL = properties['mysql'] or {} %}
+{% set MYSQL = PROPERTIES['mysql'] or {} %}
 {% set MYSQL_PORT = MYSQL['port'] or 3306 %}
 {% set MYSQL_PASSWORD = MYSQL['password'] or 'mysql-password' %}
 {% set MYSQL_DISK = MYSQL['disk'] or 'mysql-disk' %}

examples/wordpress/wordpress.yaml

@@ -0,0 +1,6 @@
+imports:
+- path: wordpress.jinja
+
+resources:
+- name: wordpress
+  type: wordpress.jinja