summaryrefslogtreecommitdiffstats
path: root/packages
diff options
context:
space:
mode:
Diffstat (limited to 'packages')
-rw-r--r--packages/install/src/files/base.conf9
-rw-r--r--packages/install/src/files/feature-server-pool.conf30
2 files changed, 5 insertions, 34 deletions
diff --git a/packages/install/src/files/base.conf b/packages/install/src/files/base.conf
index 19a5e44b..a154639f 100644
--- a/packages/install/src/files/base.conf
+++ b/packages/install/src/files/base.conf
@@ -1,16 +1,16 @@
###
# ============LICENSE_START=======================================================
-# ONAP POLICY
+# ONAP
# ================================================================================
-# Copyright (C) 2017-2020 AT&T Intellectual Property. All rights reserved.
+# Copyright (C) 2017-2021 AT&T Intellectual Property. All rights reserved.
# Modifications Copyright (C) 2020 Bell Canada.
# ================================================================================
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
-#
+#
# http://www.apache.org/licenses/LICENSE-2.0
-#
+#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -101,6 +101,7 @@ PAP_HOST=
PAP_USERNAME=
PAP_PASSWORD=
POLICY_PDP_PAP_GROUP=defaultGroup
+POLICY_PDP_PAP_TYPE=
POLICY_PDP_PAP_POLICYTYPES=
# PDP-X
diff --git a/packages/install/src/files/feature-server-pool.conf b/packages/install/src/files/feature-server-pool.conf
deleted file mode 100644
index 3d65e61c..00000000
--- a/packages/install/src/files/feature-server-pool.conf
+++ /dev/null
@@ -1,30 +0,0 @@
-###
-# ============LICENSE_START=======================================================
-# feature-server-pool
-# ================================================================================
-# Copyright (C) 2020 AT&T Intellectual Property. All rights reserved.
-# ================================================================================
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# ============LICENSE_END=========================================================
-###
-
-SERVER_POOL_PORT=20000
-SERVER_POOL_HTTPS=
-SERVER_POOL_SITE_IP=
-SERVER_POOL_SITE_PORT=
-SERVER_POOL_HOST_LIST=
-SERVER_POOL_DISCOVERY_SERVERS=
-SERVER_POOL_DISCOVERY_TOPIC=DISCOVERY-TOPIC
-SERVER_POOL_DISCOVERY_USERNAME=
-SERVER_POOL_DISCOVERY_PASSWORD=
-DMAAP_USE_HTTPS= \ No newline at end of file