Skip to content

Commit

Permalink
[PLAT-13495] Do not run dual nic steps on systemd upgrade
Browse files Browse the repository at this point in the history
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
  • Loading branch information
mchiddy committed Jul 31, 2024
1 parent 2cfb999 commit d868a03
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 7 deletions.
6 changes: 3 additions & 3 deletions managed/devops/opscli/ybops/cloud/common/method.py
Original file line number Diff line number Diff line change
Expand Up @@ -152,8 +152,8 @@ def add_extra_args(self):
else:
self.parser.add_argument("search_pattern", nargs="?")
self.parser.add_argument("-t", "--type", default=self.YB_SERVER_TYPE)
self.parser.add_argument('--tags', action='append', default=None)
self.parser.add_argument("--skip_tags", action='append', default=None)
self.parser.add_argument('--tags', action='append', default=[])
self.parser.add_argument("--skip_tags", action='append', default=[])

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

# Check if secondary subnet is present. If so, configure it.
if host_info.get('secondary_subnet'):
if "systemd_upgrade" not in args.tags and host_info.get('secondary_subnet'):
# Wait for host to be ready to run ssh commands.
self.wait_for_host(args, use_default_ssh_port)
server_ports = self.get_server_ports_to_check(args)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@
mode: 0755
tags:
- install-software
- systemd_upgrade

- name: Setup | Create directory to land core dumps
file:
Expand Down Expand Up @@ -67,23 +68,29 @@
dest: "{{ yb_bin_dir }}/clean_cores.sh"
owner: "{{ user_name }}"
mode: 0755
tags: yb-prebuilt-ami
tags:
- yb-prebuilt-ami
- systemd_upgrade

- name: Configure | Add purge logs script
template:
src: zip_purge_yb_logs.sh.j2
dest: "{{ yb_bin_dir }}/zip_purge_yb_logs.sh"
owner: "{{ user_name }}"
mode: 0755
tags: yb-prebuilt-ami
tags:
- yb-prebuilt-ami
- systemd_upgrade

- name: Configure | Add collect metrics wrapper script
template:
src: collect_metrics_wrapper.sh.j2
dest: "{{ yb_bin_dir }}/collect_metrics_wrapper.sh"
owner: "{{ user_name }}"
mode: 0755
tags: yb-prebuilt-ami
tags:
- yb-prebuilt-ami
- systemd_upgrade

- set_fact:
cron_result: {}
Expand Down Expand Up @@ -284,7 +291,7 @@
state: present
mode: 0644

tags:
tags:
- systemd_upgrade
- install-software
when: (systemd_option and not ((ansible_os_family == 'RedHat' and ansible_distribution_major_version == '7')
Expand Down

0 comments on commit d868a03

Please sign in to comment.