Skip to content

Commit 4a43468

Browse files
authored
Use osism sync inventory (#2612)
osism sync inventory replaces osism reconciler sync. Signed-off-by: Christian Berendt <[email protected]>
1 parent 995e5e9 commit 4a43468

File tree

4 files changed

+18
-4
lines changed

4 files changed

+18
-4
lines changed

scripts/include.sh

+10
Original file line numberDiff line numberDiff line change
@@ -14,3 +14,13 @@ wait_for_container_healthy() {
1414
fi
1515
done
1616
}
17+
18+
sync_inventory() {
19+
# avoid overlaps with run_on_change
20+
sleep 10
21+
if [[ $(semver $MANAGER_VERSION 8.0.0) -ge 0 || $MANAGER_VERSION == "latest" ]]; then
22+
osism sync inventory
23+
else
24+
osism reconciler sync
25+
fi
26+
}

scripts/prepare-ceph-configuration.sh

+4-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,10 @@ if [[ $(semver $MANAGER_VERSION 7.0.0) -ge 0 || $MANAGER_VERSION == "latest" ]];
2828
cp /tmp/$(basename $node)-ceph-lvm-configuration.yml /opt/configuration/inventory/host_vars/$(basename $node)/ceph-lvm-configuration.yml
2929
fi
3030
done
31-
osism reconciler sync
31+
32+
# sync the inventory
33+
sync_inventory
34+
3235
osism apply ceph-create-lvm-devices
3336
osism apply facts
3437

scripts/upgrade-ceph.sh

+2-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,8 @@ sh -c '/opt/configuration/scripts/sync-configuration-repository.sh'
2929
osism update manager
3030
docker compose --project-directory /opt/manager ps
3131

32-
osism reconciler sync
32+
# refresh facts & sync the inventory
33+
sync_inventory
3334
osism apply facts
3435

3536
# upgrade services

scripts/upgrade.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,8 @@ if [[ "$IS_ZUUL" == "true" || "$ARA" == "false" ]]; then
5454
sh -c '/opt/configuration/scripts/disable-ara.sh'
5555
fi
5656

57-
# refresh facts & reconcile the inventory
58-
osism reconciler sync
57+
# refresh facts & sync the inventory
58+
sync_inventory
5959
osism apply facts
6060

6161
# upgrade services

0 commit comments

Comments
 (0)