openstack
/
tripleo-heat-templates
Code Issues Proposed changes

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

This commit is contained in:
Zuul 2019-12-05 16:31:44 +00:00 committed by Gerrit Code Review
parent 7a6dc87f00 21178c2d8f
commit 9cb5d3a030
1 changed files with 33 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
deployment/neutron/neutron-sriov-agent-container-puppet.yaml
View File

@ -83,6 +83,21 @@ parameters:
default: 5672 default: 5672
description: The network port for messaging backend description: The network port for messaging backend
type: number 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: resources:
@ -195,20 +210,24 @@ outputs:
name: virt_sandbox_use_netlink name: virt_sandbox_use_netlink
persistent: yes persistent: yes
state: yes state: yes
- name: "creating directory" -
file: if:
state: directory - derive_pci_whitelist_enabled
path: /var/lib/pci_passthrough_whitelist_scripts - - name: "creating directory"
owner: root file:
group: root state: directory
mode: 0750 path: /var/lib/pci_passthrough_whitelist_scripts
- name: derive pci passthrough whitelist owner: root
copy: group: root
content: {get_file: ./derive_pci_passthrough_whitelist.py} mode: 0750
dest: '/var/lib/pci_passthrough_whitelist_scripts/derive_pci_passthrough_whitelist.py' - name: derive pci passthrough whitelist
mode: 0700 copy:
- name: run derive_pci_passthrough_whitelist.py content: {get_file: ./derive_pci_passthrough_whitelist.py}
command: /var/lib/pci_passthrough_whitelist_scripts/derive_pci_passthrough_whitelist.py dest: '/var/lib/pci_passthrough_whitelist_scripts/derive_pci_passthrough_whitelist.py'
mode: 0700
- name: run derive_pci_passthrough_whitelist.py
command: /var/lib/pci_passthrough_whitelist_scripts/derive_pci_passthrough_whitelist.py
- []
metadata_settings: metadata_settings:
get_attr: [NeutronBase, role_data, metadata_settings] get_attr: [NeutronBase, role_data, metadata_settings]
upgrade_tasks: [] upgrade_tasks: []