Merge "Derive Pci passthrough whitelist disable option" into stable/stein

deployment/neutron/neutron-sriov-agent-container-puppet.yaml

@@ -83,6 +83,21 @@ parameters:
     default: 5672
     description: The network port for messaging backend
     type: number
+  DerivePciWhitelistEnabled:
+    default: true
+    description: Whether to enable or not the pci passthrough whitelist automation.
+    type: boolean
+    tags:
+      - role_specific
+
+conditions:
+
+  derive_pci_whitelist_enabled:
+    or:
+      - and:
+        - equals: [{get_param: DerivePciWhitelistEnabled}, true]
+        - equals: [{get_param: [RoleParameters, DerivePciWhitelistEnabled]}, '']
+      - equals: [{get_param: [RoleParameters, DerivePciWhitelistEnabled]}, true]
 
 resources:
 
@@ -195,7 +210,10 @@ outputs:
                 name: virt_sandbox_use_netlink
                 persistent: yes
                 state: yes
-            - name: "creating directory"
+            -
+              if:
+                - derive_pci_whitelist_enabled
+                - - name: "creating directory"
                     file:
                       state: directory
                       path: /var/lib/pci_passthrough_whitelist_scripts
@@ -209,6 +227,7 @@ outputs:
                       mode: 0700
                   - name: run derive_pci_passthrough_whitelist.py
                     command:  /var/lib/pci_passthrough_whitelist_scripts/derive_pci_passthrough_whitelist.py
+                - []
       metadata_settings:
         get_attr: [NeutronBase, role_data, metadata_settings]
       upgrade_tasks: []