Merge pull request #787 from cdrage/refactor-flags

Add --volumes parameter, deprecate emptyvols
This commit is contained in:
Charlie Drage
2017-09-08 13:08:05 -04:00
committed by GitHub
7 changed files with 195 additions and 6 deletions
+2 -2
View File
@@ -432,7 +432,7 @@ func (o *OpenShift) Deploy(komposeObject kobject.KomposeObject, opt kobject.Conv
}
pvcStr := " "
if !opt.EmptyVols {
if !opt.EmptyVols || opt.Volumes != "emptyDir" {
pvcStr = " and PersistentVolumeClaims "
}
log.Info("We are going to create OpenShift DeploymentConfigs, Services" + pvcStr + "for your Dockerized application. \n" +
@@ -500,7 +500,7 @@ func (o *OpenShift) Deploy(komposeObject kobject.KomposeObject, opt kobject.Conv
}
}
if !opt.EmptyVols {
if !opt.EmptyVols || opt.Volumes != "emptyDir" {
pvcStr = ",pvc"
} else {
pvcStr = ""