Commit 7c86d948 authored by beierl's avatar beierl
Browse files

Remove webui install 

It is already present in HSS
parent a6b45264

examples/NextEPC/build.sh

+1 −1
Original line number Diff line number Diff line
@@ -26,4 +26,4 @@ osm vnfd-delete vEPC_vnfd 
osm vnfd-create vEPC_vnfd.tar.gz || exit 1

osm nsd-create vEPC_nsd.tar.gz || exit 1



osm ns-create --ns_name EPC1 --nsd_name vEPC_nsd --ssh_keys ~/.ssh/id_rsa.pub --config_file params.yaml --vim_account vnfob
 
osm ns-create --ns_name NextEPC --nsd_name vEPC_nsd --ssh_keys ~/.ssh/id_rsa.pub --config_file params.yaml --vim_account vnfob

examples/NextEPC/charm-sources/layers/hsscharm/actions.yaml

+0 −2
Original line number Diff line number Diff line
@@ -11,5 +11,3 @@ configure-hss: 
         default: 0.0.0.0

restart-hss:

   description: Restarts the service of the VNF
 
install-webui:

   description: Downloads and installs the optional WebUI that allows for subscriber management

examples/NextEPC/charm-sources/layers/hsscharm/reactive/hsscharm.py

+0 −14
Original line number Diff line number Diff line
@@ -50,17 +50,3 @@ def restart_hss(): 
    charms.sshproxy._run(cmd)

    remove_flag('actions.restart-hss')



@when('actions.install-webui')

def install_webui():



    for cmd in [

        'sudo apt update',

        'sudo apt install curl',

        'curl -sL https://deb.nodesource.com/setup_12.x | sudo -E bash -',

        'sudo apt install -y nodejs',

        'curl -sL https://nextepc.org/static/webui/install  | sudo -E bash -'

        ]:

            charms.sshproxy._run(cmd)



    remove_flag('actions.install-webui')

examples/NextEPC/vEPC_vnfd/vEPC_vnfd.yaml

+0 −2
Original line number Diff line number Diff line
@@ -114,8 +114,6 @@ vnfd:vnfd-catalog: 
               name: restart-hss

            juju:

               charm: hsscharm

            config-primitive:

            -  name: install-webui

#######################################################################################################################

      internal-vld:

      -  id: s6a