openstack/octavia
Code Issues Proposed changes

KeystoneAuth global configuration data

Browse Source 
This configuration data will be used by any Octavia code that requires a
service account.

Change-Id: Icd4b419cec5f49d5adae9a5f623ce15d0eb19ae0
This commit is contained in:
Adam Harwell 2014-11-10 16:10:55 -06:00
parent b353c59420
commit b965777fac
3 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
etc/octavia.conf
View File

@ -17,3 +17,9 @@
# be set in the corresponding core plugin '.ini' file. However, it is suggested # be set in the corresponding core plugin '.ini' file. However, it is suggested
# to put the [database] section and its connection attribute in this # to put the [database] section and its connection attribute in this
# configuration file. # configuration file.
[keystone_authtoken]
# auth_uri = https://localhost:5000/v3
# admin_user = octavia
# admin_password = password
# admin_project_id = service

8
octavia/common/config.py
View File

@ -75,10 +75,18 @@ core_opts = [
' more than one region.')), ' 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 = [] core_cli_opts = []
# Register the configuration options # Register the configuration options
cfg.CONF.register_opts(core_opts) cfg.CONF.register_opts(core_opts)
cfg.CONF.register_opts(keystone_authtoken_opts, group='keystone_authtoken')
cfg.CONF.register_cli_opts(core_cli_opts) cfg.CONF.register_cli_opts(core_cli_opts)
# Ensure that the control exchange is set correctly # Ensure that the control exchange is set correctly

1
requirements.txt
View File

@ -27,5 +27,6 @@ oslo.config>=1.4.0.0a3
oslo.db>=0.4.0 # Apache-2.0 oslo.db>=0.4.0 # Apache-2.0
oslo.messaging>=1.4.0.0a3 oslo.messaging>=1.4.0.0a3
oslo.rootwrap>=1.3.0.0a1 oslo.rootwrap>=1.3.0.0a1
python-keystoneclient>=0.11.1
python-novaclient>=2.17.0 python-novaclient>=2.17.0
posix_ipc posix_ipc