From 503ab1a0166add6e6b67d1539532bf2978269375 Mon Sep 17 00:00:00 2001 From: zhiyuan_cai Date: Mon, 13 Feb 2017 14:47:55 +0800 Subject: [PATCH] Remove cmd folder 1. What is the problem After manual installation guide is updated in this patch[1], cmd folder is no longer refered to 2. What is the solution to the problem Remove cmd folder, also remove two setting options in devstack/settings 3. What the features need to be implemented to the Tricircle No new features [1] https://review.openstack.org/#/c/432838/ Change-Id: Ia6bc07ac868f7dcbe46f49f27c602780ee76ecd3 --- cmd/api.py | 61 ----------------------------------------------- cmd/manage.py | 36 ---------------------------- cmd/xjob.py | 59 --------------------------------------------- devstack/settings | 2 -- 4 files changed, 158 deletions(-) delete mode 100644 cmd/api.py delete mode 100644 cmd/manage.py delete mode 100644 cmd/xjob.py diff --git a/cmd/api.py b/cmd/api.py deleted file mode 100644 index 06fbc319..00000000 --- a/cmd/api.py +++ /dev/null @@ -1,61 +0,0 @@ -# Copyright 2015 Huawei Technologies Co., Ltd. -# 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. - -# Much of this module is based on the work of the Ironic team -# see http://git.openstack.org/cgit/openstack/ironic/tree/ironic/cmd/api.py - -import sys - -from oslo_config import cfg -from oslo_log import log as logging -from oslo_service import wsgi - -from tricircle.api import app -from tricircle.common import config -from tricircle.common.i18n import _LI -from tricircle.common.i18n import _LW -from tricircle.common import restapp - - -CONF = cfg.CONF -LOG = logging.getLogger(__name__) - - -def main(): - config.init(app.common_opts, sys.argv[1:]) - application = app.setup_app() - - host = CONF.bind_host - port = CONF.bind_port - workers = CONF.api_workers - - if workers < 1: - LOG.warning(_LW("Wrong worker number, worker = %(workers)s"), workers) - workers = 1 - - LOG.info(_LI("Admin API on http://%(host)s:%(port)s with %(workers)s"), - {'host': host, 'port': port, 'workers': workers}) - - service = wsgi.Server(CONF, 'Tricircle Admin_API', application, host, port) - restapp.serve(service, CONF, workers) - - LOG.info(_LI("Configuration:")) - CONF.log_opt_values(LOG, logging.INFO) - - restapp.wait() - - -if __name__ == '__main__': - main() diff --git a/cmd/manage.py b/cmd/manage.py deleted file mode 100644 index ba76b745..00000000 --- a/cmd/manage.py +++ /dev/null @@ -1,36 +0,0 @@ -# Copyright 2015 Huawei Technologies Co., Ltd. -# 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. - - -import sys - -from oslo_config import cfg - -from tricircle.db import core -from tricircle.db import migration_helpers - - -def main(argv=None, config_files=None): - core.initialize() - cfg.CONF(args=argv[2:], - project='tricircle', - default_config_files=config_files) - migration_helpers.find_migrate_repo() - migration_helpers.sync_repo(2) - - -if __name__ == '__main__': - config_file = sys.argv[1] - main(argv=sys.argv, config_files=[config_file]) diff --git a/cmd/xjob.py b/cmd/xjob.py deleted file mode 100644 index 7a76c045..00000000 --- a/cmd/xjob.py +++ /dev/null @@ -1,59 +0,0 @@ -# Copyright 2015 Huawei Technologies Co., Ltd. -# 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. - -# Much of this module is based on the work of the Ironic team -# see http://git.openstack.org/cgit/openstack/ironic/tree/ironic/cmd/api.py - -import eventlet - -if __name__ == "__main__": - eventlet.monkey_patch() - -import sys - -from oslo_config import cfg -from oslo_log import log as logging - -from tricircle.common import config -from tricircle.common.i18n import _LI, _LW - -from tricircle.xjob import xservice - -CONF = cfg.CONF -LOG = logging.getLogger(__name__) - - -def main(): - config.init(xservice.common_opts, sys.argv[1:]) - - host = CONF.host - workers = CONF.workers - - if workers < 1: - LOG.warning(_LW("Wrong worker number, worker = %(workers)s"), workers) - workers = 1 - - LOG.info(_LI("XJob Server on http://%(host)s with %(workers)s"), - {'host': host, 'workers': workers}) - - xservice.serve(xservice.create_service(), workers) - - LOG.info(_LI("Configuration:")) - CONF.log_opt_values(LOG, logging.INFO) - - xservice.wait() - -if __name__ == '__main__': - main() diff --git a/devstack/settings b/devstack/settings index 305f5b97..acc5b6e4 100644 --- a/devstack/settings +++ b/devstack/settings @@ -19,7 +19,6 @@ TRICIRCLE_CONF_DIR=${TRICIRCLE_CONF_DIR:-/etc/tricircle} TRICIRCLE_STATE_PATH=${TRICIRCLE_STATE_PATH:-/var/lib/tricircle} # tricircle rest admin api -TRICIRCLE_API=$TRICIRCLE_DIR/cmd/api.py TRICIRCLE_API_CONF=$TRICIRCLE_CONF_DIR/api.conf TRICIRCLE_API_LISTEN_ADDRESS=${TRICIRCLE_API_LISTEN_ADDRESS:-0.0.0.0} @@ -28,7 +27,6 @@ TRICIRCLE_API_PORT=${TRICIRCLE_API_PORT:-19999} TRICIRCLE_API_PROTOCOL=${TRICIRCLE_API_PROTOCOL:-$SERVICE_PROTOCOL} # tricircle xjob -TRICIRCLE_XJOB=$TRICIRCLE_DIR/cmd/xjob.py TRICIRCLE_XJOB_CONF=$TRICIRCLE_CONF_DIR/xjob.conf TRICIRCLE_AUTH_CACHE_DIR=${TRICIRCLE_AUTH_CACHE_DIR:-/var/cache/tricircle}