Merge "fix duplicated ntp configuration"
This commit is contained in:
commit
d62b36fc20
@ -107,12 +107,12 @@ def retrieve_ntp_server_url(cluster):
|
|||||||
return cl_configs[target][name]
|
return cl_configs[target][name]
|
||||||
|
|
||||||
|
|
||||||
def configure_ntp(cluster_id):
|
def configure_ntp(cluster_id, instance_ids=None):
|
||||||
cluster = conductor.cluster_get(context.ctx(), cluster_id)
|
cluster = conductor.cluster_get(context.ctx(), cluster_id)
|
||||||
if not is_ntp_enabled(cluster):
|
if not is_ntp_enabled(cluster):
|
||||||
LOG.debug("Don't configure NTP on cluster")
|
LOG.debug("Don't configure NTP on cluster")
|
||||||
return
|
return
|
||||||
instances = c_u.get_instances(cluster)
|
instances = c_u.get_instances(cluster, instance_ids)
|
||||||
url = retrieve_ntp_server_url(cluster)
|
url = retrieve_ntp_server_url(cluster)
|
||||||
with context.ThreadGroup() as tg:
|
with context.ThreadGroup() as tg:
|
||||||
for instance in instances:
|
for instance in instances:
|
||||||
|
@ -341,7 +341,7 @@ def _provision_scaled_cluster(cluster_id, node_group_id_map):
|
|||||||
|
|
||||||
# Setting up new nodes with the plugin
|
# Setting up new nodes with the plugin
|
||||||
if instance_ids:
|
if instance_ids:
|
||||||
ntp_service.configure_ntp(cluster_id)
|
ntp_service.configure_ntp(cluster_id, instance_ids)
|
||||||
cluster = c_u.change_cluster_status(
|
cluster = c_u.change_cluster_status(
|
||||||
cluster, c_u.CLUSTER_STATUS_CONFIGURING)
|
cluster, c_u.CLUSTER_STATUS_CONFIGURING)
|
||||||
instances = c_u.get_instances(cluster, instance_ids)
|
instances = c_u.get_instances(cluster, instance_ids)
|
||||||
|
Loading…
Reference in New Issue
Block a user