Overrides
diff --git a/opencontrail/client/resource/analytics_node.yml b/opencontrail/client/resource/analytics_node.yml
index 5380b7e..424c88a 100644
--- a/opencontrail/client/resource/analytics_node.yml
+++ b/opencontrail/client/resource/analytics_node.yml
@@ -1,10 +1,17 @@
 parameters:
+  _param:
+    opencontrail_analytics_node01_hostname: nal01
+    opencontrail_analytics_node02_hostname: nal02
+    opencontrail_analytics_node03_hostname: nal03
   opencontrail:
     client:
       analytics_node:
-        nal01:
+        member01:
+          name: ${_param:opencontrail_analytics_node01_hostname}
           ip_address: ${_param:cluster_node01_address}
-        nal02:
+        member02:
+          name: ${_param:opencontrail_analytics_node02_hostname}
           ip_address: ${_param:cluster_node02_address}
-        nal03:
+        member03:
+          name: ${_param:opencontrail_analytics_node03_hostname}
           ip_address: ${_param:cluster_node03_address}
diff --git a/opencontrail/client/resource/config_node.yml b/opencontrail/client/resource/config_node.yml
index 1fc44e7..2e6802c 100644
--- a/opencontrail/client/resource/config_node.yml
+++ b/opencontrail/client/resource/config_node.yml
@@ -1,10 +1,17 @@
 parameters:
+  _param:
+    opencontrail_control_node01_hostname: ntw01
+    opencontrail_control_node02_hostname: ntw02
+    opencontrail_control_node03_hostname: ntw03
   opencontrail:
     client:
       config_node:
-        ntw01:
+        member01:
+          name: ${_param:opencontrail_control_node01_hostname}
           ip_address: ${_param:cluster_node01_address}
-        ntw02:
+        member02:
+          name: ${_param:opencontrail_control_node02_hostname}
           ip_address: ${_param:cluster_node02_address}
-        ntw03:
+        member03:
+          name: ${_param:opencontrail_control_node03_hostname}
           ip_address: ${_param:cluster_node03_address}
diff --git a/opencontrail/client/resource/database_node.yml b/opencontrail/client/resource/database_node.yml
index 1cc60a0..508dff0 100644
--- a/opencontrail/client/resource/database_node.yml
+++ b/opencontrail/client/resource/database_node.yml
@@ -1,10 +1,17 @@
 parameters:
+  _param:
+    opencontrail_control_node01_hostname: ntw01
+    opencontrail_control_node02_hostname: ntw02
+    opencontrail_control_node03_hostname: ntw03
   opencontrail:
     client:
       database_node:
-        ntw01:
+        member01:
+          name: ${_param:opencontrail_control_node01_hostname}
           ip_address: ${_param:cluster_node01_address}
-        ntw02:
+        member02:
+          name: ${_param:opencontrail_control_node02_hostname}
           ip_address: ${_param:cluster_node02_address}
-        ntw03:
+        member03:
+          name: ${_param:opencontrail_control_node03_hostname}
           ip_address: ${_param:cluster_node03_address}
diff --git a/opencontrail/client/resource/virtual_router.yml b/opencontrail/client/resource/virtual_router.yml
index 96497d0..0333c8f 100644
--- a/opencontrail/client/resource/virtual_router.yml
+++ b/opencontrail/client/resource/virtual_router.yml
@@ -1,7 +1,10 @@
 parameters:
+  _param:
+    contrail_compute_dpdk_enabled: False
   opencontrail:
     client:
       virtual_router:
         local_compute:
           name: ${linux:system:name}
           ip_address: ${_param:single_address}
+          dpdk_enabled: ${_param:contrail_compute_dpdk_enabled}
\ No newline at end of file
diff --git a/opencontrail/compute/dpdk.yml b/opencontrail/compute/dpdk.yml
index 47464b6..b0d8e0c 100644
--- a/opencontrail/compute/dpdk.yml
+++ b/opencontrail/compute/dpdk.yml
@@ -1,11 +1,13 @@
 parameters:
+  _param:
+    contrail_compute_dpdk_enabled: True
   nova:
     compute:
       libvirt_service: libvirt-bin
   opencontrail:
     compute:
       dpdk:
-        enabled: true
+        enabled: ${_param:contrail_compute_dpdk_enabled}
         taskset: "${_param:compute_vrouter_taskset}"
         socket_mem: "${_param:compute_vrouter_socket_mem}"
       interface: