diff options
| author | justin-hopper <justin.hopper@hp.com> | 2013-04-26 14:50:19 -0700 |
|---|---|---|
| committer | justin-hopper <justin.hopper@hp.com> | 2013-05-08 16:11:02 -0700 |
| commit | 770c0fd83b19ef2b55a032f750f9e22b9c4c5ea1 (patch) | |
| tree | a3f0095fc495f4bc2803e0a9d2a08ac780b6357e /bin | |
| parent | 08a57d70356c1c173531ff3a5c85f56f4d4bf4ca (diff) | |
| download | trove-770c0fd83b19ef2b55a032f750f9e22b9c4c5ea1.tar.gz | |
Refreshed Oslo Code
Change to auth_tok to auth_token
Added dependency on oslo.config package
Remove reddwarf.openstack.common.cfg
Change-Id: I61af7a54d09f3d1d6b6efe470ea6308be8ace2e7
Fixes: bug #1175757
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/reddwarf-guestagent | 4 | ||||
| -rw-r--r-- | bin/reddwarf-mgmt-taskmanager | 2 | ||||
| -rwxr-xr-x | bin/reddwarf-server | 3 | ||||
| -rwxr-xr-x | bin/reddwarf-taskmanager | 2 |
4 files changed, 5 insertions, 6 deletions
diff --git a/bin/reddwarf-guestagent b/bin/reddwarf-guestagent index cb06f8d9..cabb1534 100755 --- a/bin/reddwarf-guestagent +++ b/bin/reddwarf-guestagent @@ -39,7 +39,7 @@ if os.path.exists(os.path.join(possible_topdir, 'reddwarf', '__init__.py')): from reddwarf.common import cfg from reddwarf.common import rpc from reddwarf.guestagent import dbaas -from reddwarf.openstack.common import cfg as openstack_cfg +from oslo.config import cfg as openstack_cfg from reddwarf.openstack.common import log as logging from reddwarf.openstack.common import service from reddwarf.db import get_db_api @@ -62,4 +62,4 @@ if __name__ == '__main__': except RuntimeError as error: import traceback print traceback.format_exc() - sys.exit("ERROR: %s" % error)
\ No newline at end of file + sys.exit("ERROR: %s" % error) diff --git a/bin/reddwarf-mgmt-taskmanager b/bin/reddwarf-mgmt-taskmanager index a8c1a3d9..15078276 100644 --- a/bin/reddwarf-mgmt-taskmanager +++ b/bin/reddwarf-mgmt-taskmanager @@ -38,7 +38,7 @@ if os.path.exists(os.path.join(possible_topdir, 'reddwarf', '__init__.py')): from reddwarf.common import cfg from reddwarf.common import rpc -from reddwarf.openstack.common import cfg as openstack_cfg +from oslo.config import cfg as openstack_cfg from reddwarf.openstack.common import log as logging from reddwarf.openstack.common import service from reddwarf.db import get_db_api diff --git a/bin/reddwarf-server b/bin/reddwarf-server index 5cee185d..c562034b 100755 --- a/bin/reddwarf-server +++ b/bin/reddwarf-server @@ -34,8 +34,7 @@ if os.path.exists(os.path.join(possible_topdir, 'reddwarf', '__init__.py')): sys.path.insert(0, possible_topdir) from reddwarf.common import cfg -from reddwarf.openstack.common import cfg as openstack_cfg -from reddwarf.openstack.common import service +from oslo.config import cfg as openstack_cfg from reddwarf.openstack.common import log as logging from reddwarf.common import wsgi from reddwarf.db import get_db_api diff --git a/bin/reddwarf-taskmanager b/bin/reddwarf-taskmanager index 5864f502..4294a19a 100755 --- a/bin/reddwarf-taskmanager +++ b/bin/reddwarf-taskmanager @@ -38,7 +38,7 @@ if os.path.exists(os.path.join(possible_topdir, 'reddwarf', '__init__.py')): from reddwarf.common import cfg from reddwarf.common import rpc -from reddwarf.openstack.common import cfg as openstack_cfg +from oslo.config import cfg as openstack_cfg from reddwarf.openstack.common import log as logging from reddwarf.openstack.common import service from reddwarf.db import get_db_api |