From 7ceb4a376a68e263a16d4305ac2dcb9d96fe90fa Mon Sep 17 00:00:00 2001 From: James Gu Date: Mon, 12 Oct 2020 14:37:31 -0700 Subject: functest healthcheck failures - Overrides the default new user role value with "_member_" - Updated treasuremap ref to include inflight upstream patches for healthcheck Updated nova and neutron overrides due to pod 15 PCI address changes for VFs - Added site name input in test.sh so it can used to test for all intel pod envs - Added init_cloud in the deployment script to create test image, flavor and provider network - Updated the heat template for pod 15 and 17 public network creation Signed-off-by: James Gu Change-Id: I6738d80e98332a3523e541d5178d8a920e28def5 --- site/intel-pod15/networks/physical/networks.yaml | 6 ------ site/intel-pod15/site-definition.yaml | 2 +- .../charts/osh/openstack-compute-kit/neutron.yaml | 5 +++++ .../charts/osh/openstack-compute-kit/nova.yaml | 25 ++++++++++++++++++++++ 4 files changed, 31 insertions(+), 7 deletions(-) create mode 100644 site/intel-pod15/software/charts/osh/openstack-compute-kit/nova.yaml (limited to 'site/intel-pod15') diff --git a/site/intel-pod15/networks/physical/networks.yaml b/site/intel-pod15/networks/physical/networks.yaml index b5d19aa..f93b9bf 100644 --- a/site/intel-pod15/networks/physical/networks.yaml +++ b/site/intel-pod15/networks/physical/networks.yaml @@ -252,10 +252,4 @@ data: # NEWSITE-CHANGEME: Update to the gateway address for this network gateway: 10.10.155.1 metric: 100 - labels: - # NEWSITE-CHANGEME: All cruisers should have this enabled, set to false if this - # is a special case in corridor 1 that doesn't support a floating IP pool. - # If set to false, IP Addresses and CIDR will still need to be specified - # above to satisfy the schema and substitution used by other documents. - enabled: true ... diff --git a/site/intel-pod15/site-definition.yaml b/site/intel-pod15/site-definition.yaml index 068cd36..37a8549 100644 --- a/site/intel-pod15/site-definition.yaml +++ b/site/intel-pod15/site-definition.yaml @@ -12,6 +12,6 @@ data: repositories: global: - revision: refs/changes/79/755079/5 + revision: refs/changes/47/757647/7 url: https://opendev.org/airship/treasuremap.git ... diff --git a/site/intel-pod15/software/charts/osh/openstack-compute-kit/neutron.yaml b/site/intel-pod15/software/charts/osh/openstack-compute-kit/neutron.yaml index fcbac5b..94f74f6 100644 --- a/site/intel-pod15/software/charts/osh/openstack-compute-kit/neutron.yaml +++ b/site/intel-pod15/software/charts/osh/openstack-compute-kit/neutron.yaml @@ -23,4 +23,9 @@ data: conf: sriov_init: - besteffort + plugins: + sriov_agent: + sriov_nic: + physical_device_mappings: sriovnet1:ens785f1 + exclude_devices: ens785f1:0000:05:10.1; 0000:05:10.3 ... diff --git a/site/intel-pod15/software/charts/osh/openstack-compute-kit/nova.yaml b/site/intel-pod15/software/charts/osh/openstack-compute-kit/nova.yaml new file mode 100644 index 0000000..0f5595f --- /dev/null +++ b/site/intel-pod15/software/charts/osh/openstack-compute-kit/nova.yaml @@ -0,0 +1,25 @@ +--- +schema: armada/Chart/v1 +metadata: + schema: metadata/Document/v1 + replacement: true + name: nova + layeringDefinition: + abstract: false + layer: site + parentSelector: + name: nova-cruiserlite + component: nova + actions: + - method: merge + path: . + storagePolicy: cleartext +data: + values: + conf: + nova: + pci: + ## NOTE: Exclude vf0 from each of the sriov nic + passthrough_whitelist: | + [{"address": {"domain":"0000","bus":"05","slot":"10","function":"[57]"}, "physical_network": "sriovnet1"},{"address": {"domain":"0000","bus":"05","slot":"1[1-7]","function":"[1357]"}, "physical_network": "sriovnet1"}] +... -- cgit 1.2.3-korg