From e6a438eeefd27a0af15c6817193bf51eb209beb3 Mon Sep 17 00:00:00 2001
From: Rajesh Tailor <ratailor@redhat.com>
Date: Fri, 2 Jun 2017 14:35:59 +0530
Subject: [PATCH] Move PCI options to PCI group

This change I886045ab4e6bdb8418fd1ccdcd811417ecb4ad4a has moved PCI
configuration options to 'pci' group. They should no longer be
included in the "DEFAULT' group. The following options affected by
this change:
``pci_alias``
``pci_passthrough_whilelist``

Change-Id: Ia973da9d60c4d4cec14b861db47a76d219da5a9f
---
 manifests/api.pp                                         | 2 +-
 manifests/compute.pp                                     | 2 +-
 .../move-pci-config-to-pci-group-441c47b2d1c36837.yaml   | 9 +++++++++
 spec/classes/nova_api_spec.rb                            | 2 +-
 spec/classes/nova_compute_spec.rb                        | 4 ++--
 5 files changed, 14 insertions(+), 5 deletions(-)
 create mode 100644 releasenotes/notes/move-pci-config-to-pci-group-441c47b2d1c36837.yaml

diff --git a/manifests/api.pp b/manifests/api.pp
index c3fc1be59..c45bfec9a 100644
--- a/manifests/api.pp
+++ b/manifests/api.pp
@@ -534,7 +534,7 @@ as a standalone service, or httpd for being run by a httpd server")
 
   if $pci_alias {
     nova_config {
-      'DEFAULT/pci_alias': value => check_array_of_hash($pci_alias);
+      'pci/pci_alias': value => check_array_of_hash($pci_alias);
     }
   }
 
diff --git a/manifests/compute.pp b/manifests/compute.pp
index c3f574177..c2816f8b7 100644
--- a/manifests/compute.pp
+++ b/manifests/compute.pp
@@ -204,7 +204,7 @@ class nova::compute (
   nova_config {
     'DEFAULT/reserved_host_memory_mb':           value => $reserved_host_memory;
     'DEFAULT/heal_instance_info_cache_interval': value => $heal_instance_info_cache_interval;
-    'DEFAULT/pci_passthrough_whitelist':         value => $pci_passthrough_real;
+    'pci/pci_passthrough_whitelist':             value => $pci_passthrough_real;
     'DEFAULT/resize_confirm_window':             value => $resize_confirm_window;
     'DEFAULT/vcpu_pin_set':                      value => $vcpu_pin_set_real;
     'DEFAULT/resume_guests_state_on_host_boot':  value => $resume_guests_state_on_host_boot;
diff --git a/releasenotes/notes/move-pci-config-to-pci-group-441c47b2d1c36837.yaml b/releasenotes/notes/move-pci-config-to-pci-group-441c47b2d1c36837.yaml
new file mode 100644
index 000000000..fcac1694e
--- /dev/null
+++ b/releasenotes/notes/move-pci-config-to-pci-group-441c47b2d1c36837.yaml
@@ -0,0 +1,9 @@
+---
+upgrade:
+  - |
+    PCI configuration options have been moved to the 'pci' group. They
+    should no longer be included in the 'DEFAULT' group. Options affected
+    by this change:
+
+    * ``pci_alias``
+    * ``pci_passthrough_whitelist``
diff --git a/spec/classes/nova_api_spec.rb b/spec/classes/nova_api_spec.rb
index 8defbedb3..cbf35482e 100644
--- a/spec/classes/nova_api_spec.rb
+++ b/spec/classes/nova_api_spec.rb
@@ -187,7 +187,7 @@ describe 'nova::api' do
       end
 
       it 'configures nova pci_alias entries' do
-        is_expected.to contain_nova_config('DEFAULT/pci_alias').with(
+        is_expected.to contain_nova_config('pci/pci_alias').with(
           'value' => "[{\"vendor_id\":\"8086\",\"product_id\":\"0126\",\"name\":\"graphic_card\"},{\"vendor_id\":\"9096\",\"product_id\":\"1520\",\"name\":\"network_card\"}]"
         )
       end
diff --git a/spec/classes/nova_compute_spec.rb b/spec/classes/nova_compute_spec.rb
index 9acea227e..96d23c8bd 100644
--- a/spec/classes/nova_compute_spec.rb
+++ b/spec/classes/nova_compute_spec.rb
@@ -131,7 +131,7 @@ describe 'nova::compute' do
       it { is_expected.to contain_nova_config('DEFAULT/resume_guests_state_on_host_boot').with_value(true) }
 
       it 'configures nova pci_passthrough_whitelist entries' do
-        is_expected.to contain_nova_config('DEFAULT/pci_passthrough_whitelist').with(
+        is_expected.to contain_nova_config('pci/pci_passthrough_whitelist').with(
           'value' => "[{\"vendor_id\":\"8086\",\"product_id\":\"0126\"},{\"vendor_id\":\"9096\",\"product_id\":\"1520\",\"physical_network\":\"physnet1\"}]"
         )
       end
@@ -155,7 +155,7 @@ describe 'nova::compute' do
         is_expected.to contain_nova_config('DEFAULT/vcpu_pin_set').with(:value => '<SERVICE DEFAULT>')
       end
       it 'clears pci_passthrough configuration' do
-        is_expected.to contain_nova_config('DEFAULT/pci_passthrough_whitelist').with(:value => '<SERVICE DEFAULT>')
+        is_expected.to contain_nova_config('pci/pci_passthrough_whitelist').with(:value => '<SERVICE DEFAULT>')
       end
     end