Skip to content

get root device fix #470

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
obstiger wants to merge 1 commit into
base: master
Choose a base branch
from
Open

get root device fix #470

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 11 additions & 1 deletion src/main/java/hudson/plugins/ec2/SlaveTemplate.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -961,7 +961,11 @@ private void setupRootDevice(List<BlockDeviceMapping> deviceMappings) {
LOGGER.warning("AMI missing block devices");
return;
}
BlockDeviceMapping rootMapping = rootDeviceMappings.get(0);
BlockDeviceMapping rootMapping = getRootDeviceMapping(rootDeviceMappings);
if (rootMapping==null) {
LOGGER.warning("AMI missing root device");
return;
}
LOGGER.info("AMI had " + rootMapping.getDeviceName());
LOGGER.info(rootMapping.getEbs().toString());

Expand All @@ -984,6 +988,12 @@ private void setupRootDevice(List<BlockDeviceMapping> deviceMappings) {
}
}

private BlockDeviceMapping getRootDeviceMapping(List<BlockDeviceMapping> deviceMappings) {
return deviceMappings.stream().filter(mapping -> mapping.getDeviceName().equals(getImage().getRootDeviceName()))
.findFirst()
.orElse(null);
}

private List<BlockDeviceMapping> getNewEphemeralDeviceMapping() {

final List<BlockDeviceMapping> oldDeviceMapping = getAmiBlockDeviceMappings();
Expand Down