Remove glusterfs states execution from k8s templates
* According to [1], there is no glusterfs states in k8s
clusters anymore.
* Fix IP address for vsrx in juniper.conf
10.70.0.90 -> 10.70.0.91 (10.70.0.90 is used by cfg01 now)
[1] https://gerrit.mcp.mirantis.net/#/c/10093/
Change-Id: I1231f95dbc15eb850058708565c9dcef736da349
Reviewed-on: https://review.gerrithub.io/378272
Reviewed-by: Dennis Dmitriev <dis.xcom@gmail.com>
Tested-by: Dennis Dmitriev <dis.xcom@gmail.com>
diff --git a/tcp_tests/templates/virtual-mcp11-k8s-calico/common-services.yaml b/tcp_tests/templates/virtual-mcp11-k8s-calico/common-services.yaml
index 5d8864c..93ea104 100644
--- a/tcp_tests/templates/virtual-mcp11-k8s-calico/common-services.yaml
+++ b/tcp_tests/templates/virtual-mcp11-k8s-calico/common-services.yaml
@@ -43,33 +43,33 @@
skip_fail: false
# Isntall SL core services
-- description: Install glusterfs
- cmd: salt --hard-crash --state-output=mixed --state-verbose=False
- -C 'I@glusterfs:server' state.sls glusterfs.server.service
- node_name: {{ HOSTNAME_CFG01 }}
- retry: {count: 1, delay: 5}
- skip_fail: false
+#- description: Install glusterfs
+# cmd: salt --hard-crash --state-output=mixed --state-verbose=False
+# -C 'I@glusterfs:server' state.sls glusterfs.server.service
+# node_name: {{ HOSTNAME_CFG01 }}
+# retry: {count: 1, delay: 5}
+# skip_fail: false
-- description: Setup glusterfs on primary controller
- cmd: salt --hard-crash --state-output=mixed --state-verbose=False
- -C 'I@glusterfs:server' state.sls glusterfs.server.setup -b 1
- node_name: {{ HOSTNAME_CFG01 }}
- retry: {count: 1, delay: 5}
- skip_fail: false
+#- description: Setup glusterfs on primary controller
+# cmd: salt --hard-crash --state-output=mixed --state-verbose=False
+# -C 'I@glusterfs:server' state.sls glusterfs.server.setup -b 1
+# node_name: {{ HOSTNAME_CFG01 }}
+# retry: {count: 1, delay: 5}
+# skip_fail: false
-- description: Check the gluster status
- cmd: salt --hard-crash --state-output=mixed --state-verbose=False
- -C 'I@glusterfs:server' cmd.run 'gluster peer status; gluster volume status' -b 1
- node_name: {{ HOSTNAME_CFG01 }}
- retry: {count: 1, delay: 5}
- skip_fail: false
+#- description: Check the gluster status
+# cmd: salt --hard-crash --state-output=mixed --state-verbose=False
+# -C 'I@glusterfs:server' cmd.run 'gluster peer status; gluster volume status' -b 1
+# node_name: {{ HOSTNAME_CFG01 }}
+# retry: {count: 1, delay: 5}
+# skip_fail: false
-- description: Install gluserfs client
- cmd: salt --hard-crash --state-output=mixed --state-verbose=False
- -C 'I@glusterfs:client' state.sls glusterfs.client
- node_name: {{ HOSTNAME_CFG01 }}
- retry: {count: 1, delay: 5}
- skip_fail: false
+#- description: Install gluserfs client
+# cmd: salt --hard-crash --state-output=mixed --state-verbose=False
+# -C 'I@glusterfs:client' state.sls glusterfs.client
+# node_name: {{ HOSTNAME_CFG01 }}
+# retry: {count: 1, delay: 5}
+# skip_fail: false
- description: Install Galera on first server
cmd: salt --hard-crash --state-output=mixed --state-verbose=False
diff --git a/tcp_tests/templates/virtual-mcp11-k8s-contrail/common-services.yaml b/tcp_tests/templates/virtual-mcp11-k8s-contrail/common-services.yaml
index 07a0a87..064decd 100644
--- a/tcp_tests/templates/virtual-mcp11-k8s-contrail/common-services.yaml
+++ b/tcp_tests/templates/virtual-mcp11-k8s-contrail/common-services.yaml
@@ -28,35 +28,35 @@
retry: {count: 1, delay: 5}
skip_fail: false
-- description: Install glusterfs
- cmd: salt --hard-crash --state-output=mixed --state-verbose=False
- -C 'I@glusterfs:server' state.sls glusterfs.server.service
- node_name: {{ HOSTNAME_CFG01 }}
- retry: {count: 1, delay: 5}
- skip_fail: false
+#- description: Install glusterfs
+# cmd: salt --hard-crash --state-output=mixed --state-verbose=False
+# -C 'I@glusterfs:server' state.sls glusterfs.server.service
+# node_name: {{ HOSTNAME_CFG01 }}
+# retry: {count: 1, delay: 5}
+# skip_fail: false
-- description: Setup glusterfs on primary controller
- cmd: salt --hard-crash --state-output=mixed --state-verbose=False
- -C 'I@glusterfs:server' state.sls glusterfs.server.setup -b 1
- node_name: {{ HOSTNAME_CFG01 }}
- retry: {count: 1, delay: 5}
- skip_fail: false
+#- description: Setup glusterfs on primary controller
+# cmd: salt --hard-crash --state-output=mixed --state-verbose=False
+# -C 'I@glusterfs:server' state.sls glusterfs.server.setup -b 1
+# node_name: {{ HOSTNAME_CFG01 }}
+# retry: {count: 1, delay: 5}
+# skip_fail: false
-- description: Check the gluster status
- cmd: salt --hard-crash --state-output=mixed --state-verbose=False
- -C 'I@glusterfs:server' cmd.run 'gluster peer status; gluster volume status' -b 1
- node_name: {{ HOSTNAME_CFG01 }}
- retry: {count: 1, delay: 5}
- skip_fail: false
+#- description: Check the gluster status
+# cmd: salt --hard-crash --state-output=mixed --state-verbose=False
+# -C 'I@glusterfs:server' cmd.run 'gluster peer status; gluster volume status' -b 1
+# node_name: {{ HOSTNAME_CFG01 }}
+# retry: {count: 1, delay: 5}
+# skip_fail: false
# Isntall SL core services
-- description: Install gluserfs client
- cmd: salt --hard-crash --state-output=mixed --state-verbose=False
- -C 'I@glusterfs:client' state.sls glusterfs.client
- node_name: {{ HOSTNAME_CFG01 }}
- retry: {count: 1, delay: 5}
- skip_fail: false
+#- description: Install gluserfs client
+# cmd: salt --hard-crash --state-output=mixed --state-verbose=False
+# -C 'I@glusterfs:client' state.sls glusterfs.client
+# node_name: {{ HOSTNAME_CFG01 }}
+# retry: {count: 1, delay: 5}
+# skip_fail: false
- description: Install Galera on first server
cmd: salt --hard-crash --state-output=mixed --state-verbose=False
diff --git a/tcp_tests/templates/virtual-mcp11-k8s-contrail/juniper.conf b/tcp_tests/templates/virtual-mcp11-k8s-contrail/juniper.conf
index af91728..398a257 100644
--- a/tcp_tests/templates/virtual-mcp11-k8s-contrail/juniper.conf
+++ b/tcp_tests/templates/virtual-mcp11-k8s-contrail/juniper.conf
@@ -51,7 +51,7 @@
ge-0/0/2 {
unit 0 {
family inet {
- address 10.70.0.90/24;
+ address 10.70.0.91/24;
}
}
}