openstack
/
magnum
Code Issues Proposed changes

Fix the kubernetes opts 

We missed that kubernetes opitions in opts file
it needed that to get correct genconfig file.

Closes-Bug: #1465902
Change-Id: I8fa3dbdb2641a775fc5deafb0a52e52d29f0d3b6
This commit is contained in:
Kai Qiang Wu(Kennan) 2015-06-17 03:16:30 +00:00
parent 7eb5f9786f
commit 8d061755fd
2 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
etc/magnum/magnum.conf.sample
View File

@ -718,6 +718,20 @@
#admin_tenant_name = admin
[kubernetes]
#
# From magnum
#
# Default protocol of k8s master endpoint (http or https). (string
# value)
#k8s_protocol = http
# Default port of the k8s master endpoint. (integer value)
#k8s_port = 8080
[matchmaker_redis]
#

3
magnum/opts.py
View File

@ -25,6 +25,7 @@ import magnum.common.magnum_keystoneclient
import magnum.conductor.config
import magnum.conductor.handlers.bay_conductor
import magnum.conductor.handlers.docker_conductor
import magnum.conductor.handlers.k8s_conductor
import magnum.conductor.template_definition
import magnum.db.sqlalchemy.models
import magnum.openstack.common.eventlet_backdoor
@ -53,4 +54,6 @@ def list_opts():
('docker', magnum.conductor.handlers.docker_conductor.docker_opts),
('heat_client', magnum.common.clients.heat_client_opts),
('bay_heat', magnum.conductor.handlers.bay_conductor.bay_heat_opts),
('kubernetes',
magnum.conductor.handlers.k8s_conductor.kubernetes_opts),
]