|
|
@ -215,26 +215,21 @@ func (m *manager) PutDeployment(name string, t *Template) (*Deployment, error) {
|
|
|
|
return nil, err
|
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
// TODO(bmelville): This should just return a new manifest filled in.
|
|
|
|
manifest, err := m.createManifest(t)
|
|
|
|
et, err := m.expander.ExpandTemplate(*t)
|
|
|
|
|
|
|
|
if err != nil {
|
|
|
|
if err != nil {
|
|
|
|
|
|
|
|
log.Printf("Manifest creation failed: %v", err)
|
|
|
|
|
|
|
|
m.repository.SetDeploymentStatus(name, FailedStatus)
|
|
|
|
return nil, err
|
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
if err := m.deployer.PutConfiguration(et.Config); err != nil {
|
|
|
|
err = m.repository.AddManifest(t.Name, manifest)
|
|
|
|
|
|
|
|
if err != nil {
|
|
|
|
|
|
|
|
m.repository.SetDeploymentStatus(name, FailedStatus)
|
|
|
|
return nil, err
|
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
manifest := &Manifest{
|
|
|
|
if err := m.deployer.PutConfiguration(manifest.ExpandedConfig); err != nil {
|
|
|
|
Deployment: t.Name,
|
|
|
|
m.repository.SetDeploymentStatus(name, FailedStatus)
|
|
|
|
Name: generateManifestName(),
|
|
|
|
|
|
|
|
InputConfig: t,
|
|
|
|
|
|
|
|
ExpandedConfig: et.Config,
|
|
|
|
|
|
|
|
Layout: et.Layout,
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
err = m.repository.AddManifest(t.Name, manifest)
|
|
|
|
|
|
|
|
if err != nil {
|
|
|
|
|
|
|
|
return nil, err
|
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|