Merge branch '512-wordpress-has-two-mariadb-volumes' into 'master'

Resolve "Wordpress has two mariadb volumes"

Closes #512

See merge request openappstack/openappstack!247

ansible/roles/apps/templates/wordpress-settings.yaml

@@ -11,7 +11,6 @@ wordpress:
       usid: admin
       pssw: "{{ wordpress_admin_password }}"
   site:
-    alt_path: openappstack-login
     # NOTE: Make sure you use underscore and that the localisation is in full caps
     locale: en_US
     version: 5.3.2
@@ -44,10 +43,11 @@ database:
     password: "{{ wordpress_mariadb_password }}"
   rootUser:
     password: "{{ wordpress_mariadb_root_password }}"
-  persistence:
-    ## Enable PostgreSQL persistence using Persistent Volume Claims.
-    enabled: true
-    existingClaim: "wordpress-mariadb"
+  master:
+    persistence:
+      ## Enable MariaDB persistence using Persistent Volume Claims.
+      enabled: true
+      existingClaim: "wordpress-mariadb"
   replication:
     enabled: false
 

flux/wordpress.yaml

@@ -9,7 +9,7 @@ spec:
   releaseName: wordpress
   chart:
     git: https://code.greenhost.net/open/wordpress-helm
-    ref: f262679bbe3de3660e8b2d70f2f5b27955bd9472
+    ref: a114e276777b2e25357ff8307dfb712c3e7a9689
     path: .
   valuesFrom:
     - secretKeyRef:

openappstack/cluster.py

@@ -247,7 +247,7 @@ class Cluster:
             rocketchat_admin_password
 
         behave_config['behave.userdata']['wordpress.url'] = \
-            'https://www.{}/openappstack-login'.format(self.domain)
+            'https://www.{}/wp-login.php'.format(self.domain)
         behave_config['behave.userdata']['wordpress.username'] = 'admin'
         behave_config['behave.userdata']['wordpress.password'] = \
             wordpress_admin_password