Merge pull request ansible#167 from sadsfae/master

Update WP version to 4.6, make firewalld rules non-fatal
zengqingfu1442 · Nov 1, 2016 · 87718c7 · 87718c7
2 parents d2fe3ac + 9feee82
commit 87718c7
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/wordpress-nginx_rhel7/group_vars/all b/wordpress-nginx_rhel7/group_vars/all
@@ -1,7 +1,7 @@
 ---
 # Variables listed here are applicable to all host groups
-wp_version: 4.3
-wp_sha256sum: 3b0db3abe8504f15a33cf64188a493ec0de01eaa8d20e37c3d6a1d9fa0a40fb4
+wp_version: 4.6
+wp_sha256sum: c1856cf969b1e73025ba2c681491908c3a4a6c5a2333f4531bf9bfb90f634380
 
 # MySQL settings
 mysqlservice: mysqld

diff --git a/wordpress-nginx_rhel7/roles/mariadb/tasks/main.yml b/wordpress-nginx_rhel7/roles/mariadb/tasks/main.yml
@@ -24,4 +24,5 @@
   service: name=mariadb state=started enabled=yes
 
 - name: insert firewalld rule
-  firewalld: port={{ mysql_port }}/tcp permanent=true state=enabled immediate=yes
+  firewalld: port={{ mysql_port }}/tcp permanent=true state=enabled immediate=yes
+  ignore_errors: yes
diff --git a/wordpress-nginx_rhel7/roles/nginx/tasks/main.yml b/wordpress-nginx_rhel7/roles/nginx/tasks/main.yml
@@ -8,6 +8,7 @@
 
 - name: insert firewalld rule for nginx
   firewalld: port={{ nginx_port }}/tcp permanent=true state=enabled immediate=yes
+  ignore_errors: yes
 
 - name: http service state
   service: name=nginx state=started enabled=yes