From 26ddb92785c1637ffc7c96a62ba24627b2d107c9 Mon Sep 17 00:00:00 2001
From: Carlos Camacho <carloscamachoucv@gmail.com>
Date: Sun, 27 Aug 2023 23:33:51 +0200
Subject: [PATCH] testing: lints partial fixes

This commit resolves the following lint rules:

- 'var-naming[no-reserved]'
- 'var-naming[no-role-prefix]'
- 'var-naming[pattern]'
- 'yaml[colons]'
- 'yaml[commas]'
- 'yaml[comments]'
- 'yaml[empty-lines]'
- 'yaml[indentation]'
- 'yaml[key-duplicates]'
- 'yaml[line-length]'
- 'yaml[octal-values]'
- 'name[template]'
- 'name[casing]'

Partially-solves: openshift-psap#10
---
 roles/cluster/cluster_set_scale/tasks/main.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/roles/cluster/cluster_set_scale/tasks/main.yml b/roles/cluster/cluster_set_scale/tasks/main.yml
index dd3152177..2731da3c4 100644
--- a/roles/cluster/cluster_set_scale/tasks/main.yml
+++ b/roles/cluster/cluster_set_scale/tasks/main.yml
@@ -75,7 +75,11 @@
     set_fact:
       first_machineset: "{{ oc_get_machinesets.stdout_lines[0] }}"
 
+<<<<<<< HEAD
   - name: Set the replicas of the first {{ machineset_instance_type + 'machineset (' + first_machineset + ') to ' + scale | string }}
+=======
+  - name: Set the replicas of the first {{ machineset_instance_type + 'machineset (' + first_machineset + ') to ' + scale }}
+>>>>>>> 8c9be3ae (testing: lints partial fixes)
     command: >
       oc patch machineset -n openshift-machine-api {{ first_machineset }}
       --patch '{"spec": {"replicas": {{ scale }} }}' --type merge