Automatically generate the server scripts

This brings novajoin in line with other projects and fixes
source-based kolla container installs.

Change-Id: I506b560d44ac15722262da8f8942af76d61d847c
This commit is contained in:
Rob Crittenden 2017-05-25 11:25:22 -04:00
parent d55333ea02
commit b6e5a889a7
4 changed files with 6 additions and 49 deletions

View File

@ -12,6 +12,7 @@
# License for the specific language governing permissions and limitations
# under the License.
import os
import sys
from novajoin import config
@ -103,6 +104,8 @@ def process_launcher():
def main():
# rcrit: work around "PKCS #11 module returned CKR_DEVICE_ERROR"
os.environ['NSS_STRICT_NOFORK'] = 'DISABLED'
keystone_client.register_keystoneauth_opts(CONF)
CONF(sys.argv[1:], version='1.0.12',

View File

@ -1,22 +0,0 @@
#!/usr/bin/python
# Copyright 2016 Red Hat, Inc.
#
# 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 novajoin.notifications import main
if __name__ == "__main__":
sys.exit(main())

View File

@ -1,25 +0,0 @@
#!/usr/bin/python
# Copyright 2016 Red Hat, Inc.
#
# 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
import os
from novajoin.wsgi import main
if __name__ == "__main__":
# rcrit: work around "PKCS #11 module returned CKR_DEVICE_ERROR"
os.environ['NSS_STRICT_NOFORK'] = 'DISABLED'
sys.exit(main())

View File

@ -31,8 +31,6 @@ data_files =
files/join-api-paste.ini
files/cloud-config-novajoin.json
/usr/sbin =
scripts/novajoin-notify
scripts/novajoin-server
scripts/novajoin-install
/usr/libexec = scripts/novajoin-ipa-setup
/usr/share/man/man1 =
@ -66,3 +64,6 @@ oslo.config.opts =
oslo.config.opts.defaults =
novajoin = novajoin.middleware.config:set_config_defaults
console_scripts =
novajoin-server = novajoin.wsgi:main
novajoin-notify = novajoin.notifications:main