diff --git a/Vagrantfile b/Vagrantfile index 08b2ec1..91b9b0a 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -70,7 +70,7 @@ Vagrant.configure(2) do |config| } end - config.vm.provision "ansible_local" do |prerequisites| + config.vm.provision "prerequisites", type:"ansible_local" do |prerequisites| prerequisites.provisioning_path = "/home/vagrant/openshift-ansible/playbooks/" prerequisites.compatibility_mode = "2.0" prerequisites.verbose = true @@ -85,7 +85,7 @@ Vagrant.configure(2) do |config| } end - config.vm.provision "ansible_local" do |deploy_cluster| + config.vm.provision "deploy_cluster", type:"ansible_local" do |deploy_cluster| deploy_cluster.provisioning_path = "/home/vagrant/openshift-ansible/playbooks/" deploy_cluster.compatibility_mode = "2.0" deploy_cluster.verbose = true @@ -101,7 +101,7 @@ Vagrant.configure(2) do |config| } end - config.vm.provision "ansible_local" do |postinstall| + config.vm.provision "postinstall", type:"ansible_local" do |postinstall| postinstall.playbook = "/vagrant/ansible/site.yml" postinstall.compatibility_mode = "2.0" postinstall.extra_vars = { diff --git a/ansible/group_vars/OSEv3.yml b/ansible/group_vars/OSEv3.yml index 74bfc55..5a094ab 100644 --- a/ansible/group_vars/OSEv3.yml +++ b/ansible/group_vars/OSEv3.yml @@ -8,9 +8,26 @@ openshift_deployment_type: origin openshift_image_tag: v{{ openshift_ansible_version }}.0 # Security -## uncomment the following to enable htpasswd authentication; defaults to AllowAllPasswordIdentityProvider -openshift_master_identity_providers: - - name: htpasswd_auth +openshift_master_identity_providers: + # - name: LDAP + # challenge: false + # login: true + # mappingMethod: claim + # kind: LDAPPasswordIdentityProvider + # attributes: + # id: + # - dn + # email: + # - mail + # name: + # - cn + # preferredUsername: + # - uid + # bindDN: '' + # bindPassword: '' + # insecure: true + # url: "ldap://host:port/basedn?attribute?scope?filter" + - name: HTTP login: true challenge: true kind: HTPasswdPasswordIdentityProvider diff --git a/ansible/roles/openshift/templates/backupimage.sh b/ansible/roles/openshift/templates/backupimage.sh new file mode 100644 index 0000000..833def3 --- /dev/null +++ b/ansible/roles/openshift/templates/backupimage.sh @@ -0,0 +1,45 @@ +#!/bin/bash + +# Tag part +podman images | awk 'NR>1 {print $0}' | while read -r line; do + +# Main environments + 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' ) + +# Patterns for sed + k8s="k8s.gcr.io" + docker="docker.io" + quay="quay.io" + +# 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" + fi + + if [[ "$line" == *"$quay"* ]]; + then + podman tag "$img_name_old":"$img_version" "$img_name_quay":"$img_version" + fi +done + +# Push part +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" +done \ No newline at end of file