Commit d05f56c7 authored by lavado's avatar lavado
Browse files

Merge branch 'master' into 'master' 

Point to the charm store. resources do not work

See merge request !121
parents bedbb2d1 6f07a282

magma/squid_cnf/juju-bundles/bundle.yaml

+1 −3
Original line number Diff line number Diff line
@@ -2,10 +2,8 @@ description: Squid Bundle 
bundle: kubernetes

applications:

  squid:

    charm: '../charms/squid'

    charm: cs:~charmed-osm/squid

    scale: 1

    resources:

      image: domfleischmann/squid-python

    #    storage:

    #      docker: 50M

    #      spool: 50M