Commit 3ae0d83c authored by Mark Beierl's avatar Mark Beierl
Browse files

Merge branch 'ha-proxy-charms' into 'master' 

Fix HA Proxy charms and add k8s proxy charms

See merge request !66
parents a4c919b8 f63c3e80

.gitmodules

+6 −0
Original line number Diff line number Diff line
@@ -22,3 +22,9 @@ 
[submodule "charm-packages/ha_proxy_charm_vnf/charms/simple/mod/charms.osm"]

	path = charm-packages/ha_proxy_charm_vnf/charms/simple/mod/charms.osm

	url = https://github.com/charmed-osm/charms.osm

[submodule "charm-packages/k8s_proxy_charm_vnf/charms/simple/mod/charms.osm"]

	path = charm-packages/k8s_proxy_charm_vnf/charms/simple/mod/charms.osm

	url = https://github.com/charmed-osm/charms.osm

[submodule "charm-packages/k8s_proxy_charm_vnf/charms/simple/mod/operator"]

	path = charm-packages/k8s_proxy_charm_vnf/charms/simple/mod/operator

	url = https://github.com/canonical/operator

charms.osm @ a9498d19

Compare 7938406a to a9498d19
Original line number Diff line number Diff line 
Subproject commit 7938406a724cd87b73e111d724f120d7a5172d7f
 
Subproject commit a9498d19ea1783461aa605253f6155a3d0ce43d8

charm-packages/ha_proxy_charm_vnf/ha_proxy_charm_vnfd.yaml

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ vnfd:vnfd-catalog: 
        vdu:

        -   id: mgmtVM

            name: mgmtVM

            image: ubuntu16.04

            image: ubuntu18.04

            count: 1

            vm-flavor:

                vcpu-count: 1

charm-packages/k8s_proxy_charm_ns/icons/osm.png

0 → 100644
+54.6 KiB
Loading image diff...

charm-packages/k8s_proxy_charm_ns/k8s_proxy_charm_nsd.yaml

0 → 100755
+39 −0
Original line number Diff line number Diff line 
nsd:nsd-catalog:

    nsd:

    -   id: k8s_proxy_charm-ns

        name: k8s_proxy_charm-ns

        short-name: k8s_proxy_charm-ns

        description: NS with 2 VNFs with cloudinit connected by datanet and mgmtnet VLs

        version: '1.0'

        logo: osm.png

        constituent-vnfd:

        -   vnfd-id-ref: k8s_proxy_charm-vnf

            member-vnf-index: '1'

        -   vnfd-id-ref: k8s_proxy_charm-vnf

            member-vnf-index: '2'

        vld:

        -   id: mgmtnet

            name: mgmtnet

            short-name: mgmtnet

            type: ELAN

            mgmt-network: 'true'

            vim-network-name: osm-ext

            vnfd-connection-point-ref:

            -   vnfd-id-ref: k8s_proxy_charm-vnf

                member-vnf-index-ref: '1'

                vnfd-connection-point-ref: vnf-mgmt

            -   vnfd-id-ref: k8s_proxy_charm-vnf

                member-vnf-index-ref: '2'

                vnfd-connection-point-ref: vnf-mgmt

        -   id: datanet

            name: datanet

            short-name: datanet

            type: ELAN

            vnfd-connection-point-ref:

            -   vnfd-id-ref: k8s_proxy_charm-vnf

                member-vnf-index-ref: '1'

                vnfd-connection-point-ref: vnf-data

            -   vnfd-id-ref: k8s_proxy_charm-vnf

                member-vnf-index-ref: '2'

                vnfd-connection-point-ref: vnf-data