Commit 5ea55214 authored by Mark Beierl's avatar Mark Beierl
Browse files

Merge branch 'master' into 'master'

Fix image name for nscharm user and policy vnfs

See merge request !117
parents 1ceb2608 253dd83b
Loading
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ vnfd:
  sw-image-desc:
  - id: ubuntu1604
    image: ubuntu16.04
    name: ubuntu1604
    name: ubuntu16.04
  vdu:
  - cloud-init-file: cloud-config.txt
    id: policyVM
+1 −1
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ vnfd:
  sw-image-desc:
  - id: ubuntu1604
    image: ubuntu16.04
    name: ubuntu1604
    name: ubuntu16.04
  vdu:
  - cloud-init-file: cloud-config.txt
    id: userVM