diff --git a/defaults/init.yml b/defaults/init.yml
index 2683f28..c05e518 100644
--- a/defaults/init.yml
+++ b/defaults/init.yml
@@ -14,6 +14,7 @@
 - system.defaults.jenkins
 - system.defaults.postgresql
 - system.defaults.maas
+- system.defaults.opencontrail
 - system.defaults.openstack
 - system.defaults.galera
 - system.defaults.rabbitmq
diff --git a/defaults/opencontrail/init.yml b/defaults/opencontrail/init.yml
new file mode 100644
index 0000000..24cd68e
--- /dev/null
+++ b/defaults/opencontrail/init.yml
@@ -0,0 +1,6 @@
+parameters:
+  _param:
+    opencontrail_identity_protocol: http
+    opencontrail_identity_port: 35357
+    opencontrail_identity_version: '2.0'
+    opencontrail_admin_user: 'contrail'
diff --git a/defaults/openstack/init.yml b/defaults/openstack/init.yml
index d1c712d..536fe60 100644
--- a/defaults/openstack/init.yml
+++ b/defaults/openstack/init.yml
@@ -17,6 +17,7 @@
     openstack_telemetry_redis_db: '0'
     openstack_telemetry_redis_sentinel_mastername: 'master_1'
     openstack_upgrade_enabled: False
+    openstack_region: RegionOne
     # SSL
     ceilometer_agent_ssl_enabled: False
     openstack_mysql_x509_enabled: False
diff --git a/opencontrail/compute/cluster.yml b/opencontrail/compute/cluster.yml
index 7cdcdf6..32153df 100644
--- a/opencontrail/compute/cluster.yml
+++ b/opencontrail/compute/cluster.yml
@@ -4,6 +4,7 @@
 - opencontrail
 parameters:
   _param:
+    opencontrail_version: 3.0
     opencontrail_compute_iface_mask: 24
   opencontrail:
     common:
@@ -11,25 +12,15 @@
       identity:
         engine: keystone
         host: ${_param:openstack_control_address}
-        port: 35357
+        port: ${_param:opencontrail_identity_port}
         token: ${_param:keystone_service_token}
         password: ${_param:keystone_admin_password}
       network:
-        engine: neutron
         host: ${_param:opencontrail_control_address}
-        port: 9696
     compute:
       version: ${_param:opencontrail_version}
-      disable_flow_collection: true
-      enabled: True
+      disable_flow_collection: True
       bind:
         address: ${_param:single_address}
       discovery:
         host: ${_param:opencontrail_control_address}
-      interface:
-        address: ${_param:opencontrail_compute_address}
-        dev: ${_param:opencontrail_compute_iface}
-        gateway: ${_param:opencontrail_compute_gateway}
-        mask: ${_param:opencontrail_compute_iface_mask}
-        dns: ${_param:opencontrail_compute_dns}
-        mtu: 9000
diff --git a/opencontrail/compute/cluster4_0.yml b/opencontrail/compute/cluster4_0.yml
index 3cb1514..058463d 100644
--- a/opencontrail/compute/cluster4_0.yml
+++ b/opencontrail/compute/cluster4_0.yml
@@ -1,31 +1,24 @@
-classes:
-  - service.opencontrail.compute.cluster
 applications:
 - opencontrail
+classes:
+  - service.opencontrail.compute.cluster
 parameters:
   _param:
+    opencontrail_version: 4.1
     opencontrail_compute_iface_mask: 24
-    opencontrail_version: 4.0
-    linux_repo_contrail_component: oc40
   opencontrail:
     common:
       version: ${_param:opencontrail_version}
       identity:
         engine: keystone
         host: ${_param:openstack_control_address}
-        port: 35357
+        port: ${_param:opencontrail_identity_port}
         token: ${_param:keystone_service_token}
         password: ${_param:opencontrail_admin_password}
       network:
-        engine: neutron
         host: ${_param:openstack_control_address}
-        port: 9696
     compute:
-      version: ${_param:opencontrail_version}
-      disable_flow_collection: true
-      enabled: True
-      bind:
-        address: ${_param:single_address}
+      disable_flow_collection: True
       config:
         members:
         - host: ${_param:opencontrail_control_node01_address}
@@ -41,10 +34,3 @@
         - host: ${_param:opencontrail_control_node01_address}
         - host: ${_param:opencontrail_control_node02_address}
         - host: ${_param:opencontrail_control_node03_address}
-      interface:
-        address: ${_param:opencontrail_compute_address}
-        dev: ${_param:opencontrail_compute_iface}
-        gateway: ${_param:opencontrail_compute_gateway}
-        mask: ${_param:opencontrail_compute_iface_mask}
-        dns: ${_param:opencontrail_compute_dns}
-        mtu: 9000
diff --git a/opencontrail/compute/single.yml b/opencontrail/compute/single.yml
index 6674e34..72dda61 100644
--- a/opencontrail/compute/single.yml
+++ b/opencontrail/compute/single.yml
@@ -1,7 +1,10 @@
 applications:
 - opencontrail
+classes:
+  - service.opencontrail.compute.single
 parameters:
   _param:
+    opencontrail_version: 3.0
     opencontrail_compute_iface_mask: 24
   opencontrail:
     common:
@@ -9,7 +12,7 @@
       identity:
         engine: keystone
         host: ${_param:control_address}
-        port: 35357
+        port: ${_param:opencontrail_identity_port}
         token: ${_param:keystone_service_token}
         password: ${_param:keystone_admin_password}
       network:
@@ -17,17 +20,8 @@
         host: ${_param:control_address}
         port: 9696
     compute:
-      version: ${_param:opencontrail_version}
-      enabled: True
       discovery:
         host: ${_param:control_address}
-      interface:
-        address: ${_param:opencontrail_compute_address}
-        dev: ${_param:opencontrail_compute_iface}
-        gateway: ${_param:opencontrail_compute_gateway}
-        mask: ${_param:opencontrail_compute_iface_mask}
-        dns: ${_param:opencontrail_compute_dns}
-        mtu: 9000
   nova:
     compute:
       instance_build_timeout: ${_param:nova_instance_build_timeout}
diff --git a/opencontrail/compute/single4_0.yml b/opencontrail/compute/single4_0.yml
index b98522d..952827f 100644
--- a/opencontrail/compute/single4_0.yml
+++ b/opencontrail/compute/single4_0.yml
@@ -1,9 +1,11 @@
 applications:
 - opencontrail
+classes:
+  - service.opencontrail.compute.single
 parameters:
   _param:
+    opencontrail_version: 4.1
     opencontrail_compute_iface_mask: 24
-    opencontrail_version: 4.0
     linux_repo_contrail_component: oc40
   opencontrail:
     common:
@@ -11,7 +13,7 @@
       identity:
         engine: keystone
         host: ${_param:control_address}
-        port: 35357
+        port: ${_param:opencontrail_identity_port}
         token: ${_param:keystone_service_token}
         password: ${_param:opencontrail_admin_password}
       network:
@@ -19,8 +21,6 @@
         host: ${_param:control_address}
         port: 9696
     compute:
-      version: ${_param:opencontrail_version}
-      enabled: True
       config:
         members:
         - host: ${_param:opencontrail_control_node01_address}
@@ -31,11 +31,3 @@
         - host: ${_param:opencontrail_analytics_node01_address}
         - host: ${_param:opencontrail_analytics_node02_address}
         - host: ${_param:opencontrail_analytics_node03_address}
-      interface:
-        address: ${_param:opencontrail_compute_address}
-        dev: ${_param:opencontrail_compute_iface}
-        gateway: ${_param:opencontrail_compute_gateway}
-        mask: ${_param:opencontrail_compute_iface_mask}
-        dns: ${_param:opencontrail_compute_dns}
-        mtu: 9000
-