summaryrefslogtreecommitdiffstats
path: root/type
diff options
context:
space:
mode:
authorKaspars Skels <kaspars.skels@att.com>2019-12-04 16:33:19 -0600
committerKaspars Skels <kaspars.skels@att.com>2019-12-04 16:48:23 -0600
commit425c6b76dbb4bbf172f866b914009a547511615b (patch)
treeb7a1e7e16ef274ad8854e743ba26df4440c811ab /type
parent4188aa6a9e889ce15d6e45c3738425a83c87bef6 (diff)
Remove tenant_id from Nova endpoint
Change-Id: I6d7a52cf002cc418ff07b57a75511ef72976e8d3 Signed-off-by: Kaspars Skels <kaspars.skels@att.com>
Diffstat (limited to 'type')
-rw-r--r--type/cntt/software/charts/osh/openstack-compute-kit/neutron.yaml75
-rw-r--r--type/cntt/software/config/endpoints.yaml2
2 files changed, 1 insertions, 76 deletions
diff --git a/type/cntt/software/charts/osh/openstack-compute-kit/neutron.yaml b/type/cntt/software/charts/osh/openstack-compute-kit/neutron.yaml
deleted file mode 100644
index cafdade..0000000
--- a/type/cntt/software/charts/osh/openstack-compute-kit/neutron.yaml
+++ /dev/null
@@ -1,75 +0,0 @@
----
-# This file defines hardware-specific settings for neutron. If you use the same
-# hardware profile as this environment, you should not need to change this file.
-# Otherwise, you should review the settings here and adjust for your hardware.
-# In particular:
-# 1. logical network interface names
-# 2. physical device mappigns
-# TODO: Should move to global layer and become tied to the hardware profile
-schema: armada/Chart/v1
-metadata:
- schema: metadata/Document/v1
- name: neutron
- replacement: true
- labels:
- name: neutron-cntt
- component: neutron
- layeringDefinition:
- abstract: false
- layer: type
- parentSelector:
- name: neutron-global
- actions:
- - method: merge
- path: .
- storagePolicy: cleartext
-data:
- wait:
- timeout: 1800
- test:
- timeout: 900
- values:
- labels:
- sriov:
- node_selector_key: sriov
- node_selector_value: enabled
- pod:
- security_context:
- neutron_sriov_agent:
- pod:
- runAsUser: 42424
- container:
- neutron_sriov_agent_init:
- privileged: true
- runAsUser: 0
- readOnlyRootFilesystem: false
- neutron_sriov_agent:
- readOnlyRootFilesystem: true
- privileged: true
- network:
- interface:
- sriov:
- - device: ens785f1
- num_vfs: 32
- promisc: false
- backend:
- - openvswitch
- - sriov
- conf:
- plugins:
- ml2_conf:
- ml2:
- mechanism_drivers: l2population,openvswitch,sriovnicswitch
- ml2_type_vlan:
- ## NOTE: Must have at least 1 sriov network defined
- network_vlan_ranges: external,sriovnet1:100:4000
- sriov_agent:
- securitygroup:
- firewall_driver: neutron.agent.firewall.NoopFirewallDriver
- sriov_nic:
- ## NOTE: Must have at least 1 sriov network to physical device
- ## mapping, otherwise sriov agent readiness check
- ## will fail.
- physical_device_mappings: sriovnet1:ens785f1
- exclude_devices: ""
-...
diff --git a/type/cntt/software/config/endpoints.yaml b/type/cntt/software/config/endpoints.yaml
index 2892e6c..4b70987 100644
--- a/type/cntt/software/config/endpoints.yaml
+++ b/type/cntt/software/config/endpoints.yaml
@@ -728,7 +728,7 @@ data:
admin:
host: compute-airship.DOMAIN
path:
- default: "/v2.1/%(tenant_id)s"
+ default: "/v2.1"
scheme:
default: "http"
internal: "http"