closes #23, closes #22, closes #21

Signed-off-by: disposab1e <48065501+disposab1e@users.noreply.github.com>
disposab1e · Nov 18, 2021 · 6a1151b · 6a1151b
1 parent 869b535
commit 6a1151b
Show file tree

Hide file tree

Showing 15 changed files with 26 additions and 5 deletions.
diff --git a/ansible/bastion/roles/artifactory/templates/container-artifactory-artifactory.service.j2 b/ansible/bastion/roles/artifactory/templates/container-artifactory-artifactory.service.j2
@@ -11,6 +11,7 @@ Requires=container-artifactory-postgres.service
 
 [Service]
 Environment=PODMAN_SYSTEMD_UNIT=%n
+TimeoutSec=900
 
 Restart=on-failure
 ExecStartPre=/usr/bin/rm -f %t/%n-pid %t/%n-cid

diff --git a/ansible/bastion/roles/artifactory/templates/container-artifactory-postgres.service.j2 b/ansible/bastion/roles/artifactory/templates/container-artifactory-postgres.service.j2
@@ -10,6 +10,7 @@ After=network-online.target
 
 [Service]
 Environment=PODMAN_SYSTEMD_UNIT=%n
+TimeoutSec=900
 
 Restart=always
 ExecStartPre=/usr/bin/rm -f %t/%n-pid %t/%n-cid

diff --git a/ansible/bastion/roles/clair/templates/container-clair-clair.service.j2 b/ansible/bastion/roles/clair/templates/container-clair-clair.service.j2
@@ -12,6 +12,8 @@ Requires=container-clair-postgres.service
 
 [Service]
 Environment=PODMAN_SYSTEMD_UNIT=%n
+TimeoutSec=900
+
 Restart=on-failure
 ExecStartPre=/usr/bin/rm -f %t/%n-pid %t/%n-cid
 ExecStart=/usr/bin/podman run \

diff --git a/ansible/bastion/roles/clair/templates/container-clair-postgres.service.j2 b/ansible/bastion/roles/clair/templates/container-clair-postgres.service.j2
@@ -10,6 +10,8 @@ After=network-online.target
 
 [Service]
 Environment=PODMAN_SYSTEMD_UNIT=%n
+TimeoutSec=900
+
 Restart=always
 ExecStartPre=/usr/bin/rm -f %t/%n-pid %t/%n-cid
 ExecStart=/usr/bin/podman run \

diff --git a/ansible/bastion/roles/quay/templates/container-quay-config.service.j2 b/ansible/bastion/roles/quay/templates/container-quay-config.service.j2
@@ -11,6 +11,8 @@ After=container-quay-postgres.service
 
 [Service]
 Environment=PODMAN_SYSTEMD_UNIT=%n
+TimeoutSec=900
+
 Restart=on-failure
 ExecStartPre=/usr/bin/rm -f %t/%n-pid %t/%n-cid
 ExecStart=/usr/bin/podman run \

diff --git a/ansible/bastion/roles/quay/templates/container-quay-mirror.service.j2 b/ansible/bastion/roles/quay/templates/container-quay-mirror.service.j2
@@ -12,6 +12,7 @@ Requires=container-quay-quay.service
 
 [Service]
 Environment=PODMAN_SYSTEMD_UNIT=%n
+TimeoutSec=900
 
 Restart=on-failure
 ExecStartPre=/usr/bin/rm -f %t/%n-pid %t/%n-cid

diff --git a/ansible/bastion/roles/quay/templates/container-quay-postgres.service.j2 b/ansible/bastion/roles/quay/templates/container-quay-postgres.service.j2
@@ -10,6 +10,8 @@ After=network-online.target
 
 [Service]
 Environment=PODMAN_SYSTEMD_UNIT=%n
+TimeoutSec=900
+
 Restart=always
 ExecStartPre=/usr/bin/rm -f %t/%n-pid %t/%n-cid
 ExecStart=/usr/bin/podman run \

diff --git a/ansible/bastion/roles/quay/templates/container-quay-quay.service.j2 b/ansible/bastion/roles/quay/templates/container-quay-quay.service.j2
@@ -15,6 +15,7 @@ Requires=container-clair-clair.service
 
 [Service]
 Environment=PODMAN_SYSTEMD_UNIT=%n
+TimeoutSec=900
 
 Restart=on-failure
 RestartSec=30

diff --git a/ansible/bastion/roles/quay/templates/container-quay-redis.service.j2 b/ansible/bastion/roles/quay/templates/container-quay-redis.service.j2
@@ -10,6 +10,8 @@ After=network-online.target
 
 [Service]
 Environment=PODMAN_SYSTEMD_UNIT=%n
+TimeoutSec=900
+
 Restart=always
 ExecStartPre=/usr/bin/rm -f %t/%n-pid %t/%n-cid
 ExecStart=/usr/bin/podman run \

diff --git a/ansible/bastion/roles/quay/templates/container-quay-swagger.service.j2 b/ansible/bastion/roles/quay/templates/container-quay-swagger.service.j2
@@ -11,6 +11,8 @@ After=container-quay-quay.service
 
 [Service]
 Environment=PODMAN_SYSTEMD_UNIT=%n
+TimeoutSec=900
+
 Restart=on-failure
 ExecStartPre=/usr/bin/rm -f %t/%n-pid %t/%n-cid
 ExecStart=/usr/bin/podman run \

diff --git a/ansible/okd/roles/mirror-registry/tasks/main.yml b/ansible/okd/roles/mirror-registry/tasks/main.yml
@@ -18,7 +18,7 @@
   shell: oc adm -a ${HOME}/installer/secret.json release mirror \
     --from=quay.io/openshift/okd:{{ okd_lab_install_okd_version }} \
     --to={{ okd_lab_quay_hostname }}/okd/{{ okd_lab_install_okd_name }} \
-    --to-release-image={{ okd_lab_quay_hostname }}/okd/{{ okd_lab_install_okd_name }}:{{ okd_lab_install_okd_version }}
+    --to-release-image={{ okd_lab_quay_hostname }}/okd/releases:{{ okd_lab_install_okd_version }}
   tags: 
     - registry-mirror
     - mirror

diff --git a/ansible/okd/roles/okd-config/tasks/main.yml b/ansible/okd/roles/okd-config/tasks/main.yml
@@ -68,7 +68,10 @@
     password: admin
     validate_certs: false
     host: https://api.okd.example.com:6443
+  retries: 30
+  delay: 20
   register: openshift_auth_admin_results
+  until: openshift_auth_admin_results.openshift_auth.api_key is defined
 
 - name: If login succeeded, try to log out (revoke access token)
   when: openshift_auth_admin_results.openshift_auth.api_key is defined

diff --git a/ansible/okd/roles/okd-env/templates/install-config.yaml.j2 b/ansible/okd/roles/okd-env/templates/install-config.yaml.j2
@@ -23,10 +23,12 @@ pullSecret:
 sshKey:
 imageContentSources:
 - mirrors:
-  - quay.okd.example.com/lab_okd/{{ okd_lab_install_okd_name }}
+  - quay.okd.example.com/okd/{{ okd_lab_install_okd_name }}
+  - quay.okd.example.com/okd/releases
   source: quay.io/openshift/okd
 - mirrors:
-  - quay.okd.example.com/lab_okd/{{ okd_lab_install_okd_name }}
+  - quay.okd.example.com/okd/{{ okd_lab_install_okd_name }}
+  - quay.okd.example.com/okd/releases
   source: quay.io/openshift/okd-content
 additionalTrustBundle: |
 {{lookup('file', '/etc/ca.crt') | indent( width=2, indentfirst=True) }}

diff --git a/ansible/okd/roles/okd-installer/tasks/main.yml b/ansible/okd/roles/okd-installer/tasks/main.yml
@@ -1,4 +1,4 @@
 ---
 - name: Setup installer to use Registry Mirror
-  shell: oc adm -a ${HOME}/installer/secret.json release extract --to="${HOME}/installer" --command=openshift-install "{{ okd_lab_quay_hostname }}/okd/{{ okd_lab_install_okd_name }}:{{ okd_lab_install_okd_version }}"
+  shell: oc adm -a ${HOME}/installer/secret.json release extract --to="${HOME}/installer" --command=openshift-install "{{ okd_lab_quay_hostname }}/okd/releases:{{ okd_lab_install_okd_version }}"
   tags: installer-setup
diff --git a/docs/03_install_okd.md b/docs/03_install_okd.md
@@ -538,7 +538,7 @@ ssh lab@bastion "cat ~/installer/auth/kubeadmin-password" > ~/github/okd-lab/.se
 # Apply (provision) Cluster with Terraform
 ansible-playbook ~/github/okd-lab/ansible/okd/cluster.yml --tags apply
 
-# In case the bbotstrap will not boot the first time just destroy and apply again
+# In case the a VM will not boot the first time, just destroy and apply again
 ansible-playbook ~/github/okd-lab/ansible/okd/cluster.yml --tags destroy
 ansible-playbook ~/github/okd-lab/ansible/okd/cluster.yml --tags apply