Merge "Remove duplicate {{ compute.vcpu_pin_set }} value - this value is already defined in lines 471 - 487 and 54-57 respectively Change-Id: I958a06d0911cffeeb583d1fffdf9c9fe79a2f6bc"diff --git a/nova/files/newton/nova-compute.conf.Debian b/nova/files/newton/nova-compute.conf.Debian
index 69e48e8..7df9f31 100644
--- a/nova/files/newton/nova-compute.conf.Debian
+++ b/nova/files/newton/nova-compute.conf.Debian
@@ -44,10 +44,6 @@
max_concurrent_live_migrations = {{ compute.max_concurrent_live_migrations }}
{%- endif %}
-{%- if compute.vcpu_pin_set is defined %}
-vcpu_pin_set={{ compute.vcpu_pin_set }}
-{%- endif %}
-
allow_resize_to_same_host=True
auth_strategy = keystone
diff --git a/nova/files/ocata/nova-compute.conf.Debian b/nova/files/ocata/nova-compute.conf.Debian
index 7df3b8b..dacdacb 100644
--- a/nova/files/ocata/nova-compute.conf.Debian
+++ b/nova/files/ocata/nova-compute.conf.Debian
@@ -585,25 +585,6 @@
{%- endif %}
#
-# Defines which physical CPUs (pCPUs) can be used by instance
-# virtual CPUs (vCPUs).
-#
-# Possible values:
-#
-# * A comma-separated list of physical CPU numbers that virtual CPUs can be
-# allocated to by default. Each element should be either a single CPU number,
-# a range of CPU numbers, or a caret followed by a CPU number to be
-# excluded from a previous range. For example:
-#
-# vcpu_pin_set = "4-12,^8,15"
-# (string value)
-{%- if compute.vcpu_pin_set is defined %}
-vcpu_pin_set = {{ compute.vcpu_pin_set }}
-{%- else %}
-#vcpu_pin_set=<None>
-{%- endif %}
-
-#
# This option helps you specify virtual disk to physical disk
# allocation ratio.
#
diff --git a/nova/files/pike/nova-compute.conf.Debian b/nova/files/pike/nova-compute.conf.Debian
index 35ec91a..fc34f4c 100644
--- a/nova/files/pike/nova-compute.conf.Debian
+++ b/nova/files/pike/nova-compute.conf.Debian
@@ -589,25 +589,6 @@
{%- endif %}
#
-# Defines which physical CPUs (pCPUs) can be used by instance
-# virtual CPUs (vCPUs).
-#
-# Possible values:
-#
-# * A comma-separated list of physical CPU numbers that virtual CPUs can be
-# allocated to by default. Each element should be either a single CPU number,
-# a range of CPU numbers, or a caret followed by a CPU number to be
-# excluded from a previous range. For example:
-#
-# vcpu_pin_set = "4-12,^8,15"
-# (string value)
-{%- if compute.vcpu_pin_set is defined %}
-vcpu_pin_set = {{ compute.vcpu_pin_set }}
-{%- else %}
-#vcpu_pin_set=<None>
-{%- endif %}
-
-#
# This option helps you specify virtual disk to physical disk
# allocation ratio.
#