commit 863a8ef88a64ac67de51dd8796aff221b288172a
author obutenko <obutenko@mirantis.com> Tue Nov 20 11:06:58 2018 +0200
committer Dennis Dmitriev <ddmitriev@mirantis.com> Wed Nov 21 17:12:50 2018 +0200
tree a486adaf90af023198cce3f0a0b396dc13eb8bfe
parent ac77e4f45fb3c6a007426596098c1b859fd411b3

Add missing step for glusterfs.client

- Add step "Setup glusterfs client" to the MACRO_INSTALL_GLUSTERFS()
- Add macro SHARED_CORE.MACRO_INSTALL_NGINX() with
  certificate refresh before nginx state
- Move nginx state from MACRO_INSTALL_NOVA() to MACRO_INSTALL_NGINX()
- Use SHARED_CORE macros instead of custom steps in all
  deployment templates where MACRO_INSTALL_NOVA() is used
  (to not miss MACRO_INSTALL_NGINX() )

Change-Id: Ib5a0bddf4405384edbc470d7ecbc15df442b072d
Related-Prod: PROD-25028

tcp_tests/templates/shared-sl.yaml

diff --git a/tcp_tests/templates/shared-sl.yaml b/tcp_tests/templates/shared-sl.yaml
index 413162b..34c42f0 100644
--- a/tcp_tests/templates/shared-sl.yaml
+++ b/tcp_tests/templates/shared-sl.yaml
@@ -67,14 +67,14 @@
   skip_fail: false
 {%- endmacro %}
 
-{%- macro MACRO_INSTALL_GLUSTERFS_CLIENT() %}
-- description: Install glusterfs 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: 2, delay: 15}
-  skip_fail: false
-{%- endmacro %}
+#{#%- macro MACRO_INSTALL_GLUSTERFS_CLIENT() %#}
+#- description: Install glusterfs 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: 2, delay: 15}
+#  skip_fail: false
+#{#%- endmacro %#}
 
 {%- macro MACRO_INSTALL_MONGODB() %}
 # Install slv2 infra