← Back to branch summary

~adeuring/vmbuilder/jenkins_kvm-juju-gui-use-port-6079

« back to all changes in this revision

Viewing changes to templates/img-juju.tmpl

  • Committer: Ben Howard
  • Date: 2014-07-30 16:17:32 UTC
  • Revision ID: ben.howard@ubuntu.com-20140730161732-9snm1p7tgem5o56i
Juju: if not on precise, use trusty as default series

Show diffs side-by-side

added added

removed removed

Lines of Context:
templates/img-juju.tmpl
255
255
 
256
256
def_series="precise"
257
257
def_series_v="12.04"
258
 
[ "${suite}" != "precise" -o "${suite}" != "saucy" ] &&
259
 
        def_series="trusty" && def_series_v="14.04"
 
258
[ "${suite}" != "precise" ] &&
 
259
        def_series="trusty" &&
 
260
        def_series_v="14.04"
260
261
 
261
262
# Generate the Juju Configuration for the Ubuntu user
262
263
vagrant_admin_secret=$(openssl rand -base64 6)