Commit 0bbe9b3e authored by lavado's avatar lavado
Browse files

Merge branch 'fixes_magma_squid_cnf' into 'master' 

Fixes magma squid_cnf kdu and ext-cpd

See merge request !111
parents f208d14d fbb5bdc6

magma/squid_cnf/squid_vnfd.yaml

+20 −21
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ vnfd: 
  df:

  - id: default-df

  ext-cpd:

  - id: mgmt-ext

  - id: mgmtnet-ext

    k8s-cluster-net: mgmtnet

  id: squid_cnf

  k8s-cluster:
@@ -13,7 +13,7 @@ vnfd: 
  - name: squid-kdu

    juju-bundle: bundle.yaml

    kdu-configuration:

  - config-primitive:

      config-primitive:

      - name: addurl

        parameter:

        - data-type: STRING
@@ -30,8 +30,7 @@ vnfd: 
        - data-type: STRING

          default-value: ''

          name: url

    id: squid-kdu-kdu-configuration

  mgmt-cp: mgmt-ext

  mgmt-cp: mgmtnet-ext

  product-name: squid_cnf

  provider: Canonical

  version: '1.0'