Fix contrail verstion from env

Change-Id: I7084403b73119a422cc414ef57a8d90532dc5d5d
diff --git a/classes/cluster/os-ha-contrail/infra/config.yml b/classes/cluster/os-ha-contrail/infra/config.yml
index 5eb19c7..2b04e1f 100755
--- a/classes/cluster/os-ha-contrail/infra/config.yml
+++ b/classes/cluster/os-ha-contrail/infra/config.yml
@@ -97,6 +97,11 @@
               value_template: <<node_os>>
             salt_master_host:
               value_template: <<node_master_ip>>
+        mark_contrail_version:
+          expression: <<opencontrail_version>>__startswith__oc
+          cluster_param:
+            linux_repo_contrail_component:
+              value_template: <<opencontrail_version>>
         infra_config:
           expression: <<node_hostname>>__startswith__cfg
           cluster_param:
@@ -106,8 +111,6 @@
               value_template: <<node_deploy_ip>>
             cluster_domain:
               value_template: <<node_domain>>
-            linux_repo_contrail_component:
-              value_template: <<opencontrail_version>>
         openstack_control01:
           expression: <<node_hostname>>__equals__ctl01
           cluster_param: