Fix pike,queens contrail models

Add 'secrets_encryption_enabled' and 'openstack_keystone_security'
Fix vsrx for bm and heat envs
Add valid public and tempest network for tests
Remove kvm4-6

Change-Id: I4a1632b77f95d5197deb5970a3200606910a5e74
diff --git a/tcp_tests/templates/heat-cicd-pike-contrail41-sl/salt-context-environment.yaml b/tcp_tests/templates/heat-cicd-pike-contrail41-sl/salt-context-environment.yaml
index cfda75e..46ce50c 100644
--- a/tcp_tests/templates/heat-cicd-pike-contrail41-sl/salt-context-environment.yaml
+++ b/tcp_tests/templates/heat-cicd-pike-contrail41-sl/salt-context-environment.yaml
@@ -10,6 +10,10 @@
           role: single_static_mgm
         ens4:
           role: single_static_ctl
+        ens6:
+          role: single_external
+          external_address: 10.9.0.15
+          external_network_netmask: 255.255.255.0
 
     cid01:
       reclass_storage_name: cicd_control_node01