diff --git a/etc/octavia.conf b/etc/octavia.conf index e6d747b6a2..f4a5c129b4 100644 --- a/etc/octavia.conf +++ b/etc/octavia.conf @@ -17,3 +17,9 @@ # be set in the corresponding core plugin '.ini' file. However, it is suggested # to put the [database] section and its connection attribute in this # configuration file. + +[keystone_authtoken] +# auth_uri = https://localhost:5000/v3 +# admin_user = octavia +# admin_password = password +# admin_project_id = service diff --git a/octavia/common/config.py b/octavia/common/config.py index 46e3ee7ab1..82b2f80259 100644 --- a/octavia/common/config.py +++ b/octavia/common/config.py @@ -75,10 +75,18 @@ core_opts = [ ' more than one region.')), ] +keystone_authtoken_opts = [ + cfg.StrOpt('auth_uri'), + cfg.StrOpt('admin_user'), + cfg.StrOpt('admin_password'), + cfg.StrOpt('admin_project_id'), +] + core_cli_opts = [] # Register the configuration options cfg.CONF.register_opts(core_opts) +cfg.CONF.register_opts(keystone_authtoken_opts, group='keystone_authtoken') cfg.CONF.register_cli_opts(core_cli_opts) # Ensure that the control exchange is set correctly diff --git a/requirements.txt b/requirements.txt index 1a038e7716..d31af4d899 100644 --- a/requirements.txt +++ b/requirements.txt @@ -27,5 +27,6 @@ oslo.config>=1.4.0.0a3 oslo.db>=0.4.0 # Apache-2.0 oslo.messaging>=1.4.0.0a3 oslo.rootwrap>=1.3.0.0a1 +python-keystoneclient>=0.11.1 python-novaclient>=2.17.0 posix_ipc