diff options
| author |   Alex Yang <yangyang1@zte.com.cn> | 2018-03-19 09:14:23 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2018-03-19 09:14:23 +0000 |
| commit | 57ff66cbe085f640deb7d1c6b57052f3282b05a5 (patch) | |
| tree | 8f91b9941a4c1f3686b1c10f5c0bf05e94e3dd8d /deploy | |
| parent | e791b002ecc023b2df94fbc72f7673403268b65a (diff) | |
| parent | 9fb1b507dc7a77db2f9df7541932b43e88a3a4b3 (diff) | |
Merge "Fix Licence header missing issues"
Diffstat (limited to 'deploy')
| -rwxr-xr-x | deploy/check_os_progress.sh | 9 | ||||
| -rw-r--r-- | deploy/post/keystoneauth.py | 4 | ||||
| -rwxr-xr-x | deploy/trustme.sh | 9 |
3 files changed, 21 insertions, 1 deletions
diff --git a/deploy/check_os_progress.sh b/deploy/check_os_progress.sh index fe452503..8f8e6144 100755 --- a/deploy/check_os_progress.sh +++ b/deploy/check_os_progress.sh @@ -1,4 +1,13 @@ #!/bin/bash +############################################################################## +# Copyright (c) 2018 ZTE Corporation and others. +# hu.zhijiang@zte.com.cn +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Apache License, Version 2.0 +# which accompanies this distribution, and is available at +# http://www.apache.org/licenses/LICENSE-2.0 +############################################################################## + usage() { cat << EOF diff --git a/deploy/post/keystoneauth.py b/deploy/post/keystoneauth.py index 2d7d0e75..f3d25ae0 100644 --- a/deploy/post/keystoneauth.py +++ b/deploy/post/keystoneauth.py @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2017 ZTE Coreporation and others. +# Copyright (c) 2017 ZTE Corporation and others. # feng.xiaowei@zte.com.cn # All rights reserved. This program and the accompanying materials # are made available under the terms of the Apache License, Version 2.0 @@ -30,6 +30,8 @@ class Keystoneauth(object): def _parse_openrc(self): def parse_line(creds, line): + if line.startswith('#') or "=" not in line: + return creds var = line.rstrip('"\n').replace('export ', '').split("=") # The two next lines should be modified as soon as rc_file # conforms with common rules. Be aware that it could induce diff --git a/deploy/trustme.sh b/deploy/trustme.sh index 38e2d838..1a599be6 100755 --- a/deploy/trustme.sh +++ b/deploy/trustme.sh @@ -1,4 +1,13 @@ #!/bin/sh +############################################################################## +# Copyright (c) 2018 ZTE Corporation and others. +# hu.zhijiang@zte.com.cn +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Apache License, Version 2.0 +# which accompanies this distribution, and is available at +# http://www.apache.org/licenses/LICENSE-2.0 +############################################################################## + #to be trusted by other host and no password needed when use ssh command #check parameters legality |