Skip to content

Commit

Permalink
salt: Migrate sparse volume cleanup to Python3
Browse files Browse the repository at this point in the history
See: #2726
See: #2936
  • Loading branch information
gdemonet authored and TeddyAndrieux committed Nov 27, 2020
1 parent f08fd55 commit e42a510
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/env python2
#!/usr/bin/env python3
"""Script for cleaning up MetalK8s sparse loop volumes.
Handle discovery of the device through a Volume's UUID, and then detach the
Expand Down
2 changes: 1 addition & 1 deletion salt/metalk8s/volumes/prepared/init.sls
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ Provision backing storage for {{ volume_name }}:
- require:
- metalk8s_volumes: Prepare backing storage for {{ volume_name }}
- file: Set up systemd template unit for sparse loop device provisioning
- test: Ensure Python 2 is available
- test: Ensure Python 3 is available
{%- endif %}
- require_in:
- module: Update pillar after volume provisioning
Expand Down
6 changes: 3 additions & 3 deletions salt/metalk8s/volumes/prepared/installed.sls
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ Install gdisk:
- test: Repositories configured
# Needed by the sparse volume cleanup script
Ensure Python 2 is available:
Ensure Python 3 is available:
test.fail_without_changes:
- comment: Could not find a working Python 2 installation
- unless: /usr/bin/env python2 --version
- comment: Could not find a working Python 3 installation
- unless: /usr/bin/env python3 --version

0 comments on commit e42a510

Please sign in to comment.