|
66 | 66 | PCMK_REMOTE_AUTH = "/etc/pacemaker/authkey" |
67 | 67 | COROSYNC_CONF_ORIG = tmpfiles.create()[1] |
68 | 68 | SERVICES_STOP_LIST = ["corosync-qdevice.service", "corosync.service", "hawk.service", CSYNC2_SERVICE] |
| 69 | +SERVICES_DISABLE_LIST = ["pacemaker.service", "sbd.service"] |
69 | 70 | WATCHDOG_CFG = "/etc/modules-load.d/watchdog.conf" |
70 | 71 | BOOTH_DIR = "/etc/booth" |
71 | 72 | BOOTH_CFG = "/etc/booth/booth.conf" |
@@ -832,7 +833,7 @@ def start_pacemaker(node_list=[], enable_flag=False): |
832 | 833 | except ValueError as err: |
833 | 834 | node_list.remove(node) |
834 | 835 | logger.error(err) |
835 | | - logger.info("Starting pacemaker.service on %s", ', '.join(node_list) or utils.this_node()) |
| 836 | + logger.info("Starting and enable pacemaker.service on %s", ', '.join(node_list) or utils.this_node()) |
836 | 837 | return service_manager.start_service("pacemaker.service", enable=enable_flag, node_list=node_list) |
837 | 838 |
|
838 | 839 |
|
@@ -2357,15 +2358,19 @@ def get_cluster_node_ip(node: str) -> str: |
2357 | 2358 | return ip |
2358 | 2359 |
|
2359 | 2360 |
|
2360 | | -def stop_services(stop_list, remote_addr=None): |
| 2361 | +def stop_and_disable_services(remote_addr=None): |
2361 | 2362 | """ |
2362 | | - Stop cluster related service |
| 2363 | + Stop and disable cluster related service |
2363 | 2364 | """ |
2364 | 2365 | service_manager = ServiceManager() |
2365 | | - for service in stop_list: |
| 2366 | + for service in SERVICES_STOP_LIST: |
2366 | 2367 | if service_manager.service_is_active(service, remote_addr=remote_addr): |
2367 | | - logger.info("Stopping the %s on %s", service, remote_addr if remote_addr else utils.this_node()) |
| 2368 | + logger.info("Stopping and disable %s on node %s", service, remote_addr or utils.this_node()) |
2368 | 2369 | service_manager.stop_service(service, disable=True, remote_addr=remote_addr) |
| 2370 | + for service in SERVICES_DISABLE_LIST: |
| 2371 | + if service_manager.service_is_enabled(service, remote_addr=remote_addr): |
| 2372 | + logger.info("Disable %s on node %s", service, remote_addr or utils.this_node()) |
| 2373 | + service_manager.disable_service(service, remote_addr=remote_addr) |
2369 | 2374 |
|
2370 | 2375 |
|
2371 | 2376 | def rm_configuration_files(remote=None): |
@@ -2405,7 +2410,7 @@ def remove_node_from_cluster(node, dead_node=False): |
2405 | 2410 |
|
2406 | 2411 | node_ip = get_cluster_node_ip(node) |
2407 | 2412 | if not dead_node: |
2408 | | - stop_services(SERVICES_STOP_LIST, remote_addr=node) |
| 2413 | + stop_and_disable_services(remote_addr=node) |
2409 | 2414 | qdevice.QDevice.remove_qdevice_db([node]) |
2410 | 2415 | rm_configuration_files(node) |
2411 | 2416 |
|
@@ -2818,7 +2823,7 @@ def remove_self(force_flag=False): |
2818 | 2823 | print(stdout) |
2819 | 2824 | else: |
2820 | 2825 | # disable and stop cluster |
2821 | | - stop_services(SERVICES_STOP_LIST) |
| 2826 | + stop_and_disable_services() |
2822 | 2827 | qdevice.QDevice.remove_certification_files_on_qnetd() |
2823 | 2828 | qdevice.QDevice.remove_qdevice_db([utils.this_node()]) |
2824 | 2829 | rm_configuration_files() |
|
0 commit comments