diff options
| author |   Tim Rozet <trozet@redhat.com> | 2016-09-08 04:37:38 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@172.30.200.206> | 2016-09-08 04:37:38 +0000 |
| commit | 83e3a718e26ca42465a03c7d70eb241e82e45e1e (patch) | |
| tree | d13258f64279c920a8bb5a70d436df75f22d9786 | |
| parent | bb70ea5659708fe6f81b6b6f28674dec4d6d45f1 (diff) | |
| parent | e693d6aaeb9c645a296bb3e298b1b1744045d584 (diff) | |
Merge "Fixes nova instance pinning defaults" into stable/colorado
| -rw-r--r-- | config/deploy/os-nosdn-fdio-noha.yaml | 2 | ||||
| -rw-r--r-- | config/deploy/os-nosdn-ovs-ha.yaml | 2 | ||||
| -rw-r--r-- | config/deploy/os-nosdn-ovs-noha.yaml | 2 | ||||
| -rw-r--r-- | config/deploy/os-odl_l2-fdio-ha.yaml | 2 | ||||
| -rw-r--r-- | config/deploy/os-odl_l2-fdio-noha.yaml | 2 |
5 files changed, 0 insertions, 10 deletions
diff --git a/config/deploy/os-nosdn-fdio-noha.yaml b/config/deploy/os-nosdn-fdio-noha.yaml index 81ff781d..4d27ae87 100644 --- a/config/deploy/os-nosdn-fdio-noha.yaml +++ b/config/deploy/os-nosdn-fdio-noha.yaml @@ -16,8 +16,6 @@ deploy_options: hugepages: 1024 hugepagesz: 2M Compute: - nova: - libvirtpin: 1 kernel: hugepagesz: 2M hugepages: 2048 diff --git a/config/deploy/os-nosdn-ovs-ha.yaml b/config/deploy/os-nosdn-ovs-ha.yaml index 89be0c3d..a72fef35 100644 --- a/config/deploy/os-nosdn-ovs-ha.yaml +++ b/config/deploy/os-nosdn-ovs-ha.yaml @@ -15,8 +15,6 @@ deploy_options: hugepages: 1024 hugepagesz: 2M Compute: - nova: - libvirtpin: 1 kernel: hugepagesz: 2M hugepages: 2048 diff --git a/config/deploy/os-nosdn-ovs-noha.yaml b/config/deploy/os-nosdn-ovs-noha.yaml index d13fd9ca..7d054cec 100644 --- a/config/deploy/os-nosdn-ovs-noha.yaml +++ b/config/deploy/os-nosdn-ovs-noha.yaml @@ -15,8 +15,6 @@ deploy_options: hugepagesz: 2M hugepages: 1024 Compute: - nova: - libvirtpin: 1 kernel: hugepagesz: 2M hugepages: 2048 diff --git a/config/deploy/os-odl_l2-fdio-ha.yaml b/config/deploy/os-odl_l2-fdio-ha.yaml index 75d79ce7..f1297e82 100644 --- a/config/deploy/os-odl_l2-fdio-ha.yaml +++ b/config/deploy/os-odl_l2-fdio-ha.yaml @@ -17,8 +17,6 @@ deploy_options: hugepages: 1024 hugepagesz: 2M Compute: - nova: - libvirtpin: 1 kernel: hugepagesz: 2M hugepages: 2048 diff --git a/config/deploy/os-odl_l2-fdio-noha.yaml b/config/deploy/os-odl_l2-fdio-noha.yaml index ad54fbdc..207c6f34 100644 --- a/config/deploy/os-odl_l2-fdio-noha.yaml +++ b/config/deploy/os-odl_l2-fdio-noha.yaml @@ -19,8 +19,6 @@ deploy_options: intel_iommu: 'on' iommu: pt Compute: - nova: - libvirtpin: 1 kernel: hugepagesz: 2M hugepages: 2048 |