Add port 8080 for nginx WR
Change-Id: Ib2d2cc0fadb94602f36a9b338c77159f5144f45b
diff --git a/tcp_tests/templates/shared-backup-restore.yaml b/tcp_tests/templates/shared-backup-restore.yaml
index 79a165e..043ed92 100644
--- a/tcp_tests/templates/shared-backup-restore.yaml
+++ b/tcp_tests/templates/shared-backup-restore.yaml
@@ -2,15 +2,6 @@
{%- macro MACRO_BACKUP_BACKUPNINJA() %}
-- description: WR for https://mirantis.jira.com/browse/PROD-21132
- cmd: |
- sed -i 's/listen \[\:\:\]\:80/listen \[\:\:\]\:8181/g' /etc/nginx/sites-available/default ;
- sed -i 's/listen 80 default_server/listen 8181 default_server/g' /etc/nginx/sites-available/default ;
- systemctl restart nginx;
- node_name: {{ HOSTNAME_CFG01 }}
- retry: {count: 1, delay: 1}
- skip_fail: false
-
- description: Apply backup state on minions
cmd: salt -C 'I@backupninja:server or backupninja:client' state.sls salt.minion
node_name: {{ HOSTNAME_CFG01 }}
@@ -139,9 +130,18 @@
{%- endmacro %}
+{%- macro MACRO_WR_NGINX_MASTER() %}
+- description: WR for https://mirantis.jira.com/browse/PROD-21132
+ cmd: |
+ sed -i 's/listen \[\:\:\]\:8080/listen \[\:\:\]\:8181/g'/etc/nginx/sites-available/nginx_proxy_ceph_radosgw.conf ;
+ sed -i 's/listen \[\:\:\]\:80/listen \[\:\:\]\:8181/g' /etc/nginx/sites-available/default ;
+ sed -i 's/listen 80 default_server/listen 8181 default_server/g' /etc/nginx/sites-available/default ;
+ systemctl restart nginx;
+ node_name: {{ HOSTNAME_CFG01 }}
+ retry: {count: 1, delay: 1}
+ skip_fail: false
-
-
+{%- endmacro %}
diff --git a/tcp_tests/templates/virtual-mcp-pike-dvr-ceph-rgw/openstack.yaml b/tcp_tests/templates/virtual-mcp-pike-dvr-ceph-rgw/openstack.yaml
index b378287..dbed2e1 100644
--- a/tcp_tests/templates/virtual-mcp-pike-dvr-ceph-rgw/openstack.yaml
+++ b/tcp_tests/templates/virtual-mcp-pike-dvr-ceph-rgw/openstack.yaml
@@ -233,6 +233,6 @@
retry: {count: 1, delay: 30}
skip_fail: false
-
+{{ BACKUP.MACRO_WR_NGINX_MASTER() }}
{{ BACKUP.MACRO_BACKUP_BACKUPNINJA() }}
{{ BACKUP.MACRO_BACKUP_XTRABACKUP() }}
diff --git a/tcp_tests/templates/virtual-mcp-pike-dvr/openstack.yaml b/tcp_tests/templates/virtual-mcp-pike-dvr/openstack.yaml
index 97c05e4..abed769 100644
--- a/tcp_tests/templates/virtual-mcp-pike-dvr/openstack.yaml
+++ b/tcp_tests/templates/virtual-mcp-pike-dvr/openstack.yaml
@@ -327,6 +327,7 @@
retry: {count: 1, delay: 5}
skip_fail: false
+{{ BACKUP.MACRO_WR_NGINX_MASTER() }}
{{ BACKUP.MACRO_BACKUP_BACKUPNINJA() }}
{{ BACKUP.MACRO_BACKUP_XTRABACKUP() }}
{{ SHARED.INSTALL_DOCKER_ON_GTW() }}
diff --git a/tcp_tests/templates/virtual-mcp-pike-ovs/openstack.yaml b/tcp_tests/templates/virtual-mcp-pike-ovs/openstack.yaml
index 08c7cc7..e858bcd 100644
--- a/tcp_tests/templates/virtual-mcp-pike-ovs/openstack.yaml
+++ b/tcp_tests/templates/virtual-mcp-pike-ovs/openstack.yaml
@@ -346,6 +346,7 @@
retry: {count: 1, delay: 5}
skip_fail: false
+{{ BACKUP.MACRO_WR_NGINX_MASTER() }}
{{ BACKUP.MACRO_BACKUP_BACKUPNINJA() }}
{{ BACKUP.MACRO_BACKUP_XTRABACKUP() }}
{{ SHARED.INSTALL_DOCKER_ON_GTW() }}