[ocata/mitaka] Fix ocata/mitaka templates
- deploy nginx before openstack services (PROD-22740)
- disable keystone.orchestrate.deploy state
- set correct pin for openstack repository (PROD-21071)
- remove glusterfs.client state from MACRO_INSTALL_GLUSTERFS
Change-Id: Ib343ce7894b9e6f554245380566c25bcdda65e06
diff --git a/tcp_tests/templates/cookied-mcp-mitaka-dvr/openstack.yaml b/tcp_tests/templates/cookied-mcp-mitaka-dvr/openstack.yaml
index ecafc45..699ffcb 100644
--- a/tcp_tests/templates/cookied-mcp-mitaka-dvr/openstack.yaml
+++ b/tcp_tests/templates/cookied-mcp-mitaka-dvr/openstack.yaml
@@ -32,7 +32,15 @@
node_name: {{ HOSTNAME_CFG01 }}
{%- endif %}
-{{ SHARED_OPENSTACK.MACRO_INSTALL_KEYSTONE() }}
+# Deploy nginx before openstack services (PROD-22740)
+- description: Deploy nginx proxy
+ cmd: salt --hard-crash --state-output=mixed --state-verbose=False
+ -C 'I@nginx:server' state.sls nginx
+ node_name: {{ HOSTNAME_CFG01 }}
+ retry: {count: 1, delay: 5}
+ skip_fail: true
+
+{{ SHARED_OPENSTACK.MACRO_INSTALL_KEYSTONE(USE_ORCHESTRATE=false) }}
{{ SHARED_OPENSTACK.MACRO_INSTALL_GLANCE() }}