Skip to content

Commit

Permalink
Import images via cloud-init (#1926)
Browse files Browse the repository at this point in the history
Revert bd4ddea
Revert c462195

Signed-off-by: Christian Berendt <berendt@osism.tech>
  • Loading branch information
berendt authored Dec 30, 2023
1 parent 468133c commit 1144aac
Show file tree
Hide file tree
Showing 3 changed files with 0 additions and 55 deletions.
23 changes: 0 additions & 23 deletions ansible/manager-part-3.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,19 +43,6 @@
gather_facts: true

vars:
images_stable:
- ceph-ansible:5.3.0
- ceph-ansible:6.0.2
- "inventory-reconciler:5.3.0"
- "inventory-reconciler:6.0.2"
- kolla-ansible:5.3.0
- kolla-ansible:6.0.2
- netbox:v3.4.8
- osism-ansible:5.3.0
- osism-ansible:6.0.2
- osism:0.20230902.0 # 6.0.2
- osism:0.20231129.2 # 5.3.0

images:
- "{{ ara_server_image }}"
- "{{ ara_server_mariadb_image }}"
Expand All @@ -77,16 +64,6 @@
- /opt/configuration/environments/manager/images.yml

tasks:
- name: Try to import stable manager images
ansible.builtin.shell: |
if [[ -e /home/dragon/images/{{ item }} ]]; then
skopeo copy dir:/home/dragon/images/{{ item }} docker-daemon:osism.harbor.regio.digital/osism/{{ item }}
fi
loop: "{{ images_stable }}"
changed_when: true
args:
executable: /bin/bash

- name: Pull images
community.docker.docker_image:
name: "{{ item }}"
Expand Down
25 changes: 0 additions & 25 deletions environments/custom/playbook-import-images.yml

This file was deleted.

7 changes: 0 additions & 7 deletions scripts/000-pull-images.sh
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,6 @@ echo
echo "# PULL IMAGES"
echo

if [[ $IS_ZUUL == "true" ]]; then
# Wait for task in the background to avoid bug/feature with 60 seconds
# timeout for custom plays.
task_id=$(osism apply --no-wait --format script -e custom import-images | tail -n 1 | tr -d '\n\r')
osism wait --output --format script --delay 2 $task_id
fi

kolla_services=(
barbican
cinder
Expand Down

0 comments on commit 1144aac

Please sign in to comment.