work

.gitignore

@@ -1,4 +1,4 @@
 .vagrant/
 *.retry
 .idea/
-examples/
+examples/

ansible/group_vars/OSEv3.yml

@@ -23,10 +23,10 @@ openshift_master_identity_providers:
   #       - cn
   #       preferredUsername:
   #       - uid
-  #   bindDN: ''
-  #   bindPassword: ''
+  #   bindDN: "{service_name}"
+  #   bindPassword: "{service_name_password}"
   #   insecure: true
-  #   url: "ldap://host:port/basedn?attribute?scope?filter"
+  #   url: "ldap://{url}/{top of ldap from where search users}?sAMAccountName"
   - name: HTTP
     login: true
     challenge: true
@@ -39,35 +39,24 @@ openshift_master_htpasswd_users: {'admin': '$apr1$Mf7W16Gb$6qoVR4GSLFueI4XpdMSa6
 openshift_disable_check: memory_availability,disk_availability,docker_storage
 
 # Use only CRI-O
-openshift_use_crio: True
-openshift_use_crio_only: True
+openshift_use_crio: true
+openshift_use_crio_only: true
 
 # Network
 openshift_ip: "{{ machine_ip }}"
 
-# Additional repository
-# openshift_release: "{{ openshift_ansible_version }}"
-# openshift_additional_repos:
-#   - id: centos-okd-ci
-#     name: centos-okd-ci
-#     baseurl: https://rpms.svc.ci.openshift.org/openshift-origin-v{{ openshift_ansible_version }}
-#     gpgcheck: 0
-#     enabled: 1
-
-# DNS settings
-openshift_hostname: "{{ ansible_fqdn }}"
-
 # Additional services
 ## Ansible service broker
 ansible_service_broker_install: true
+## Add Node Problem Detector
+openshift_node_problem_detector_install: false
 ## Logging
 openshift_logging_install_logging: false
 openshift_logging_es_ops_nodeselector: {"node-role.kubernetes.io/infra":"true"}
 openshift_logging_es_nodeselector: {"node-role.kubernetes.io/infra":"true"}
 
 # OKD URLs
-openshift_master_public_api_url: https://{{ dns_name }}:8443
-openshift_master_public_console_url: https://{{ dns_name }}:8443/console
+openshift_master_cluster_hostname: "{{ dns_name }}"
 openshift_master_cluster_public_hostname: "{{ dns_name }}"
 openshift_master_default_subdomain: apps.{{ dns_name }}
 
@@ -77,8 +66,7 @@ openshift_persistentlocalstorage_classes: []
 openshift_persistentlocalstorage_path: /mnt/local-storage
 openshift_persistentlocalstorage_provisionner_image: quay.io/external_storage/local-volume-provisioner:v1.0.1
 
-# If use only cri-o runtime this must be commented
-# openshift_node_groups=[{'name': 'node-config-all-in-one', 'labels': ['node-role.kubernetes.io/master=true', 'node-role.kubernetes.io/infra=true', 'node-role.kubernetes.io/compute=true']}]
+# Group description
 openshift_node_groups: 
   - name: node-config-all-in-one-crio
     labels: 
@@ -91,3 +79,9 @@ openshift_node_groups:
       - {'key': 'kubeletArguments.container-runtime-endpoint', 'value': ['unix:///var/run/crio/crio.sock']}
       - {'key': 'kubeletArguments.image-service-endpoint', 'value': ['unix:///var/run/crio/crio.sock']}
       - {'key': 'kubeletArguments.runtime-request-timeout', 'value': ['10m']}
+  - name: node-config-all-in-one
+    labels: 
+      - 'node-role.kubernetes.io/master=true'
+      - 'node-role.kubernetes.io/infra=true'
+      - 'node-role.kubernetes.io/compute=true'
+      - 'zone=dev'

ansible/roles/openshift/templates/backupimage.sh

@@ -7,21 +7,17 @@ podman images | awk 'NR>1 {print $0}' | while read -r line; do
     img_name_old=$(echo "$line"  | awk '{print $1}')
     img_version=$(echo "$line"  | awk '{print $2}')
 # Searchh registry
-    img_name_k8s=$(echo "$line"| awk '{print $1}' | sed 's#k8s.gcr.io##g' )
-    img_name_docker=$(echo "$line"| awk '{print $1}' | sed 's#docker.io##g' )
-    img_name_quay=$(echo "$line"| awk '{print $1}' | sed 's#quay.io##g' )
+    img_name_docker=$(echo "$line"| awk '{print $1}' | sed 's#docker.io#{repository}#g' )
+    img_name_quay=$(echo "$line"| awk '{print $1}' | sed 's#quay.io#{repository}#g' )
+    img_name_rh=$(echo "$line"| awk '{print $1}' | sed 's#registry.centos.org#{repository}#g' )
 
 # Patterns for sed
     k8s="k8s.gcr.io"
     docker="docker.io"
     quay="quay.io"
+    rh="registry.centos.org"
 
 # Tag commands
-    if  [[ "$line" == *"$k8s"* ]]; 
-    then
-        podman tag "$img_name_old":"$img_version" "$img_name_k8s":"$img_version"
-    fi
-
     if [[ "$line" == *"$docker"* ]];
     then
         podman tag "$img_name_old":"$img_version" "$img_name_docker":"$img_version"
@@ -31,6 +27,11 @@ podman images | awk 'NR>1 {print $0}' | while read -r line; do
     then
         podman tag "$img_name_old":"$img_version" "$img_name_quay":"$img_version"
     fi
+
+    if [[ "$line" == *"$rh"* ]];
+    then
+        podman tag "$img_name_old":"$img_version" "$img_name_rh":"$img_version"
+    fi
 done
 
 # Push part
@@ -39,7 +40,7 @@ podman images | grep harbor | while read -r line; do
 # Main environments
     img_name=$(echo "$line"  | awk '{print $1}')
     img_version=$(echo "$line"  | awk '{print $2}')
-# Push commands with creds
-    # podman login -u {username} -p {password} {repository}
-    podman push --creds {username}:{password} "$img_name":"$img_version"
+# Push commands with creds.
+    podman login -u {user} -p {password} {repository}
+    podman push  "$img_name":"$img_version"
 done