From 425c6b76dbb4bbf172f866b914009a547511615b Mon Sep 17 00:00:00 2001
From: Kaspars Skels <kaspars.skels@att.com>
Date: Wed, 4 Dec 2019 16:33:19 -0600
Subject: Remove tenant_id from Nova endpoint

Change-Id: I6d7a52cf002cc418ff07b57a75511ef72976e8d3
Signed-off-by: Kaspars Skels <kaspars.skels@att.com>
---
 .../charts/osh/openstack-compute-kit/neutron.yaml  | 75 ----------------------
 type/cntt/software/config/endpoints.yaml           |  2 +-
 2 files changed, 1 insertion(+), 76 deletions(-)
 delete mode 100644 type/cntt/software/charts/osh/openstack-compute-kit/neutron.yaml

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"
-- 
cgit 1.2.3-korg