Skip to content

Commit c688e4c

Browse files
Merge branch 'ocp-power-automation:main' into mac
2 parents 19f9288 + e50ffec commit c688e4c

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+1950
-169
lines changed

README.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,9 @@ This repository consists of additional ansible playbooks for the following:
5050
1. Validate CPU manager feature and run e2e.
5151
1. Enable DISA-STIG profiles for CO on P and remediate various rules.
5252
1. Run Openshift-tests-private testcases.
53+
1. Verify IPI day2 operations
54+
1. Deploy Openshift Data Foundation operator
55+
1. Enabling Kdump
5356

5457
## Assumptions:
5558

examples/all.yaml

Lines changed: 26 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -159,8 +159,10 @@ ocp_cluster_logging: false
159159
cluster_log_forwarder: false
160160
cluster_logging_channel: ""
161161
elastic_search_channel: ""
162+
loki_channel: ""
162163
elasticsearch_clf_cs: "" # brew.registry.redhat.io/rh-osbs/iib:111110
163164
clusterlogging_clf_cs: "" # brew.registry.redhat.io/rh-osbs/iib:11111
165+
loki_clf_cs: "" # brew.registry.redhat.io/rh-osbs/iib:111112
164166
log_label: ""
165167
elasticsearch_url: ""
166168
syslog_url: ""
@@ -425,6 +427,7 @@ logging_e2e_testcases: "" #Set to either all or critical
425427
hypershift_agent_install: false
426428
hypershift_agent_destroy: false #Enable only to destroy the hosted cluster
427429
acm_mce_install: false
430+
heterogeneous_install: false
428431
hosted_cluster_name: "hypershift-hosted"
429432
acm_catalogsource_name: "redhat-operators-acm"
430433
acm_catalogsource_image: ""
@@ -435,16 +438,20 @@ mce_upgrade_channel: "stable-2.7"
435438
base_domain: "qe-ppc64le.cis.ibm.net"
436439
pull_secret_file: "~/.pullSecret"
437440
ocp_release: ""
438-
arch: "ppc64le"
441+
ocp_release_image: ""
442+
arch_ppc: "ppc64le"
443+
arch_x86: "x86_64"
439444
hypershift_dir: "/root/hypershift"
440445
hypershift_git_repo: "https://github.com/openshift/hypershift"
441446
hypershift_git_branch: "main"
442447
cluster_namespace: "clusters"
443448
ssh_pub_key: ""
444449
db_volume_size: "10Gi"
445450
fs_volume_size: "100Gi"
446-
iso_url: ""
447-
root_fs_url: ""
451+
iso_url_ppc: ""
452+
root_fs_url_ppc: ""
453+
iso_url_x86: ""
454+
root_fs_url_x86: ""
448455

449456
# ocp-lso vars
450457
lso_enabled: false #set to true for lso operator installation
@@ -533,4 +540,19 @@ openshift_test_private_e2e_repo: "https://github.com/openshift/openshift-tests-p
533540
openshift_test_private_git_branch: "master"
534541
openshift_test_private_directory: "/tmp/openshift_test_private_e2e"
535542
openshift_test_private_golang_tarball: "https://go.dev/dl/go1.24.1.linux-ppc64le.tar.gz"
536-
testcase_filters : 'Image_Registry\\|API_Server'
543+
testcase_filters : 'Image_Registry\\|API_Server'
544+
545+
#ipi-day2-operation vars
546+
enable_ipi_day2_operation: false
547+
rsct_operator_repo: "https://github.com/ocp-power-automation/rsct-operator.git"
548+
rsct_dir: "{{ lookup('env', 'PWD') }}/rsct"
549+
rsct_namespace: rsct-operator-system
550+
lso_index: "" # provide LSO index image
551+
cluster_upi: false #set to true if using UPI cluster
552+
553+
# ocp-odf-operator required vars
554+
odf_enabled: false
555+
update_channel: ""
556+
odf_catalogsource_image: "" #Example - quay.io/rhceph-dev/ocs-registry:4.16.3
557+
test_pod_image: "quay.io/powercloud/nginx-unprivileged:latest"
558+

examples/hypershift_agent.yaml

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
hypershift_agent_install: false
55
hypershift_agent_destroy: false #Enable only to destroy the hosted cluster
66
acm_mce_install: false
7+
heterogeneous_install: false
78
hosted_cluster_name: "hypershift-hosted"
89
acm_catalogsource_name: "redhat-operators-acm"
910
acm_catalogsource_image: ""
@@ -14,13 +15,17 @@ mce_upgrade_channel: "stable-2.7"
1415
base_domain: "qe-ppc64le.cis.ibm.net"
1516
pull_secret_file: "~/.pullSecret"
1617
ocp_release: ""
17-
arch: "ppc64le"
18+
ocp_release_image: ""
19+
arch_ppc: "ppc64le"
20+
arch_x86: "x86_64"
1821
hypershift_dir: "/root/hypershift"
1922
hypershift_git_repo: "https://github.com/openshift/hypershift"
2023
hypershift_git_branch: "main"
2124
cluster_namespace: "clusters"
2225
ssh_pub_key: ""
2326
db_volume_size: "10Gi"
2427
fs_volume_size: "100Gi"
25-
iso_url: ""
26-
root_fs_url: ""
28+
iso_url_ppc: ""
29+
root_fs_url_ppc: ""
30+
iso_url_x86: ""
31+
root_fs_url_x86: ""
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
# ipi-day2-operation vars
2+
enable_ipi_day2_operation: true
3+
rsct_git_repo: "https://github.com/ocp-power-automation/rsct-operator.git"
4+
rsct_dir: "{{ lookup('env', 'PWD') }}/rsct"
5+
rsct_namespace: rsct-operator-system
6+
lso_index: "" # provide LSO index image
7+
cluster_upi: false #set to true if using UPI cluster

examples/ocp_cluster_logging_vars.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,16 @@ ocp_cluster_logging: false
33
cluster_log_forwarder: false
44
cluster_logging_channel: ""
55
elastic_search_channel: ""
6+
loki_channel: ""
67
elasticsearch_clf_cs: "" # brew.registry.redhat.io/rh-osbs/iib:111110
78
clusterlogging_clf_cs: "" # brew.registry.redhat.io/rh-osbs/iib:11111
9+
loki_clf_cs: "" # brew.registry.redhat.io/rh-osbs/iib:111112
810
log_label: ""
911
elasticsearch_url: ""
1012
syslog_url: ""
1113
fluentd_url: ""
1214
kafka_url: ""
13-
kafka_path: "" # Location of kafka on external vm ex. /root/kafka/kafka_2.13-2.7.0/bin
15+
kafka_path: "" # Location of kafka on external vm ex. /usr/local/kafka/bin
1416
loki_url: ""
1517
cloudwatch_secret: ""
1618
aws_region: ""

examples/ocp_kdump_vars.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
---
2+
#ocp-kdump vars
3+
4+
worker_node: # Enter the worker node , that needs to be crashed

examples/ocp_lso_vars.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,5 @@ lso_namespace: "" #openshift-local-storage
77
lso_channel: "" #stable,alpha,beta
88
lso_catalogsource_name: "" #my-operator-catalog
99
device_path: "" #add this by running "ls /dev/disk/by-id/......"
10+
busybox_image: "" #quay.io/powercloud/busybox:ubi
11+
upi_cluster: true

examples/ocp_odf_operator_vars.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
# ocp-odf-operator required vars
2+
odf_enabled: false
3+
update_channel: ""
4+
odf_catalogsource_image: "" #Example - quay.io/rhceph-dev/ocs-registry:4.16.3
5+
test_pod_image: "quay.io/powercloud/nginx-unprivileged:latest"

group_vars/all.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,14 +46,16 @@ ocp_cluster_logging: false
4646
cluster_log_forwarder: false
4747
cluster_logging_channel: ""
4848
elastic_search_channel: ""
49+
loki_channel: ""
4950
elasticsearch_clf_cs: "" # brew.registry.redhat.io/rh-osbs/iib:111110
5051
clusterlogging_clf_cs: "" # brew.registry.redhat.io/rh-osbs/iib:11111
52+
loki_clf_cs: "" # brew.registry.redhat.io/rh-osbs/iib:111112
5153
log_label: ""
5254
elasticsearch_url: ""
5355
syslog_url: ""
5456
fluentd_url: ""
5557
kafka_url: ""
56-
kafka_path: "" # Location of kafka on external vm ex. /root/kafka/kafka_2.13-2.7.0/bin
58+
kafka_path: "" # Location of kafka on external vm ex. /usr/local/kafka/bin
5759
loki_url: ""
5860
cloudwatch_secret: ""
5961
aws_region: ""

playbooks/ipi-day2-operation.yml

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
---
2+
- name: Run ipi day2 operation
3+
hosts: all
4+
tasks:
5+
- name: Fail incase 'KUBECONFIG' environment variable is an empty string
6+
fail:
7+
msg: KUBECONFIG environment variable must be a non-empty string
8+
when: (lookup('env', 'KUBECONFIG') == "")
9+
10+
- name: Check golang version
11+
shell: go version | awk '{ print substr ($3,3) }'
12+
register: golang_version
13+
14+
- fail:
15+
msg: golang is not installed or version < 1.22
16+
when: golang_version.rc !=0 or golang_version.stdout < "1.22"
17+
- debug:
18+
msg: "{{ golang_version }}"
19+
20+
- include_role:
21+
name: ipi-day2-operation
22+
vars:
23+
KUBECONFIG: "{{ lookup('env', 'KUBECONFIG') }}"
24+

0 commit comments

Comments
 (0)