Skip to content

Commit 2b15f15

Browse files
committed
Block deployment if the driver is configured to use a RedHat 6 or 7 OS image (#6).
1 parent 4604c12 commit 2b15f15

File tree

3 files changed

+2
-55
lines changed

3 files changed

+2
-55
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ Environment: `MCP_REGION`.
4040
* `ddcloud-vlan` - The name of the target CloudControl VLAN.
4141
* `ddcloud-image-name` - The name of the OS image used to create the target machine.
4242
Note that only OS images are supported for now, not customer images.
43-
Additionally, the OS must be a Linux distribution supported by docker-machine (Ubuntu 14.04 and above work, but Red Hat 7 has issues due to iptables configuration).
43+
Additionally, the OS must be a Linux distribution supported by docker-machine (Ubuntu 12.04 and above are supported, but RedHat 6 and 7 are not supported due to iptables configuration issues).
4444
* `ddcloud-ssh-user` - The SSH username to use.
4545
Default: "root".
4646
Environment: `MCP_SSH_USER`

driver.go

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -233,12 +233,9 @@ func (driver *Driver) PreCreateCheck() error {
233233
switch driver.ImageOSType {
234234
case "REDHAT664":
235235
case "REDHAT764":
236-
log.Warnf("Image '%s' is RedHat 6 or 7 (64-bit).",
236+
return fmt.Errorf("Image '%s' is not currently supported because the CloudControl images based on RedHat 6 and 7 are known to have problems with Docker Machine.",
237237
driver.ImageName,
238238
)
239-
log.Warnf("This image is known to have problems with Docker Machine (the ddcloud driver will need to clear the server's iptables configuration when it is provisioned).")
240-
241-
break
242239
}
243240

244241
return nil
@@ -298,17 +295,6 @@ func (driver *Driver) Create() error {
298295
return err
299296
}
300297

301-
switch driver.ImageOSType {
302-
case "REDHAT664":
303-
case "REDHAT764":
304-
err = driver.clearIPTablesConfiguration()
305-
if err != nil {
306-
return err
307-
}
308-
309-
break
310-
}
311-
312298
log.Infof("Server '%s' has been successfully created.", server.Name)
313299

314300
return nil

iptables.go

Lines changed: 0 additions & 39 deletions
This file was deleted.

0 commit comments

Comments
 (0)