Merge "Apply shared openstack actions to mitaka/ocata templates"
diff --git a/tcp_tests/templates/shared-openstack.yaml b/tcp_tests/templates/shared-openstack.yaml
index 40a81f2..37bf5f3 100644
--- a/tcp_tests/templates/shared-openstack.yaml
+++ b/tcp_tests/templates/shared-openstack.yaml
@@ -1,6 +1,13 @@
 {# Collection of common macroses shared across openstack services #}
 
 {%- macro MACRO_INSTALL_KEYSTONE() %}
+- description: Execute salt orchestration state to configure all needed
+    prerequisites like creating SSH public key ant etc.
+  cmd: salt-run state.orchestrate keystone.orchestrate.deploy
+  node_name: {{ HOSTNAME_CFG01 }}
+  retry: {count: 1, delay: 5}
+  skip_fail: false
+
 - description: Install keystone service on primary node
   cmd: salt --hard-crash --state-output=mixed --state-verbose=False
     -C 'I@keystone:server and *01*' state.sls keystone.server