Fixing bug in TOSCA config
Change-Id: I243685c71aeb9e99d54ae784eac222735dbc0a4b
diff --git a/src/main.py b/src/main.py
index 1cb49a2..6f0db8d 100644
--- a/src/main.py
+++ b/src/main.py
@@ -22,8 +22,9 @@
from xosconfig import Config
current_dir = os.path.dirname(os.path.realpath(__file__))
-config_file = os.path.join(current_dir, './xos-tosca-config.yaml')
-config_schema = os.path.join(current_dir, './xos-tosca-config-schema.yaml')
+config_file = os.path.join(current_dir, 'xos-tosca.config.yaml')
+config_schema = os.path.join(current_dir, 'xos-tosca-config-schema.yaml')
+
Config.init(config_file, config_schema)
class Main:
diff --git a/src/xos-tosca-config.yaml b/src/xos-tosca-config.yaml
deleted file mode 100644
index b5ebcbc..0000000
--- a/src/xos-tosca-config.yaml
+++ /dev/null
@@ -1,37 +0,0 @@
-
-# Copyright 2017-present Open Networking Foundation
-#
-# 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.
-
-
-# NOTE in a deployment I'm overridden by platform install
-
-name: xos-tosca
-gprc_endpoint: "xos-core.cord.lab"
-local_cert: /usr/local/share/ca-certificates/local_certs.crt
-logging:
- version: 1
- handlers:
- console:
- class: logging.StreamHandler
- file:
- class: logging.handlers.RotatingFileHandler
- filename: /var/log/xos.log
- maxBytes: 10485760
- backupCount: 5
- loggers:
- '':
- handlers:
- - console
- - file
- level: DEBUG