Update ocata-cicd model according to changes in cookiecutter

Changes taken from:
cicd: https://gerrit.mcp.mirantis.net/#/c/6751/2
stacklight: taken from virtual-mcp11-k8s-calico/stacklight

Change-Id: I9fa7a0ab76f943b96293584b3f52765965f3b906
diff --git a/classes/cluster/virtual-mcp-ocata-cicd/openstack/gateway.yml b/classes/cluster/virtual-mcp-ocata-cicd/openstack/gateway.yml
index ff8f085..9cf601b 100644
--- a/classes/cluster/virtual-mcp-ocata-cicd/openstack/gateway.yml
+++ b/classes/cluster/virtual-mcp-ocata-cicd/openstack/gateway.yml
@@ -3,7 +3,7 @@
 - system.linux.system.repo.mcp.extra
 - system.linux.system.repo.saltstack.xenial
 - system.neutron.gateway.cluster
-- cluster.virtual-mcp-ocata-cicd
+- cluster.virtual-mcp-ocata-cicd.infra
 parameters:
   _param:
     primary_interface: ens4