Skip to content

Commit d868a03

Browse files
committed
[PLAT-13495] Do not run dual nic steps on systemd upgrade
Test Plan: Test systemd upgrade on dual nic clusters Reviewers: sanketh Reviewed By: sanketh Subscribers: dnolan, anijhawan, yugaware Differential Revision: https://phorge.dev.yugabyte.com/D36899
1 parent 2cfb999 commit d868a03

File tree

2 files changed

+14
-7
lines changed

2 files changed

+14
-7
lines changed

managed/devops/opscli/ybops/cloud/common/method.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -152,8 +152,8 @@ def add_extra_args(self):
152152
else:
153153
self.parser.add_argument("search_pattern", nargs="?")
154154
self.parser.add_argument("-t", "--type", default=self.YB_SERVER_TYPE)
155-
self.parser.add_argument('--tags', action='append', default=None)
156-
self.parser.add_argument("--skip_tags", action='append', default=None)
155+
self.parser.add_argument('--tags', action='append', default=[])
156+
self.parser.add_argument("--skip_tags", action='append', default=[])
157157

158158
# If we do not have this entry from ansible.env, then set a None default, else, assume the
159159
# pem file is in the same location as the ansible.env file.
@@ -793,7 +793,7 @@ def callback(self, args):
793793
use_default_ssh_port = not ssh_port_updated
794794

795795
# Check if secondary subnet is present. If so, configure it.
796-
if host_info.get('secondary_subnet'):
796+
if "systemd_upgrade" not in args.tags and host_info.get('secondary_subnet'):
797797
# Wait for host to be ready to run ssh commands.
798798
self.wait_for_host(args, use_default_ssh_port)
799799
server_ports = self.get_server_ports_to_check(args)

managed/devops/roles/configure-cluster-server/tasks/prepare-configure-server.yml

+11-4
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@
4040
mode: 0755
4141
tags:
4242
- install-software
43+
- systemd_upgrade
4344

4445
- name: Setup | Create directory to land core dumps
4546
file:
@@ -67,23 +68,29 @@
6768
dest: "{{ yb_bin_dir }}/clean_cores.sh"
6869
owner: "{{ user_name }}"
6970
mode: 0755
70-
tags: yb-prebuilt-ami
71+
tags:
72+
- yb-prebuilt-ami
73+
- systemd_upgrade
7174

7275
- name: Configure | Add purge logs script
7376
template:
7477
src: zip_purge_yb_logs.sh.j2
7578
dest: "{{ yb_bin_dir }}/zip_purge_yb_logs.sh"
7679
owner: "{{ user_name }}"
7780
mode: 0755
78-
tags: yb-prebuilt-ami
81+
tags:
82+
- yb-prebuilt-ami
83+
- systemd_upgrade
7984

8085
- name: Configure | Add collect metrics wrapper script
8186
template:
8287
src: collect_metrics_wrapper.sh.j2
8388
dest: "{{ yb_bin_dir }}/collect_metrics_wrapper.sh"
8489
owner: "{{ user_name }}"
8590
mode: 0755
86-
tags: yb-prebuilt-ami
91+
tags:
92+
- yb-prebuilt-ami
93+
- systemd_upgrade
8794

8895
- set_fact:
8996
cron_result: {}
@@ -284,7 +291,7 @@
284291
state: present
285292
mode: 0644
286293

287-
tags:
294+
tags:
288295
- systemd_upgrade
289296
- install-software
290297
when: (systemd_option and not ((ansible_os_family == 'RedHat' and ansible_distribution_major_version == '7')

0 commit comments

Comments
 (0)