openstack
/
magnum
Code Issues Proposed changes

Pass private ip address to scale manager 

In scale manager, we get host ip address from COEs, these ip address are
all private ip address, so passing a private ip address of host of nodes
to scale manager to let it decide which nodes to be removed.

Related-Bug: #1600125
Change-Id: I1a396f55b564f1b3ca59d5f73d264ef0eb948201
This commit is contained in:
Eli Qiao 2016-07-22 14:25:07 +08:00
parent 162251ca42
commit 7a5cd248cb
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
magnum/drivers/k8s_coreos_v1/template_def.py
View File

@ -90,7 +90,7 @@ class K8sTemplateDefinition(template_def.BaseTemplateDefinition):
extra_params = kwargs.pop('extra_params', {})
scale_mgr = kwargs.pop('scale_manager', None)
if scale_mgr:
hosts = self.get_output('kube_minions')
hosts = self.get_output('kube_minions_private')
extra_params['minions_to_remove'] = (
scale_mgr.get_removal_nodes(hosts))

2
magnum/drivers/k8s_fedora_atomic_v1/template_def.py
View File

@ -91,7 +91,7 @@ class K8sTemplateDefinition(template_def.BaseTemplateDefinition):
extra_params = kwargs.pop('extra_params', {})
scale_mgr = kwargs.pop('scale_manager', None)
if scale_mgr:
hosts = self.get_output('kube_minions')
hosts = self.get_output('kube_minions_private')
extra_params['minions_to_remove'] = (
scale_mgr.get_removal_nodes(hosts))