From a2c9060f98ead782294031ec6757cd6b310afdfa Mon Sep 17 00:00:00 2001 From: garciadeblas Date: Thu, 25 Mar 2021 11:01:06 +0100 Subject: [PATCH] Updated native_k8s_charm_vnf to follow the right structure for charm-based KNF Signed-off-by: garciadeblas --- charm-packages/native_k8s_charm_vnf/juju-bundles/bundle.yaml | 2 +- .../{ => juju-bundles}/charms/nginx-k8s/actions.yaml | 0 .../{ => juju-bundles}/charms/nginx-k8s/actions/changecontent | 0 .../{ => juju-bundles}/charms/nginx-k8s/config.yaml | 0 .../{ => juju-bundles}/charms/nginx-k8s/hooks/start | 0 .../{ => juju-bundles}/charms/nginx-k8s/lib/ops/__init__.py | 0 .../{ => juju-bundles}/charms/nginx-k8s/lib/ops/charm.py | 0 .../{ => juju-bundles}/charms/nginx-k8s/lib/ops/framework.py | 0 .../{ => juju-bundles}/charms/nginx-k8s/lib/ops/jujuversion.py | 0 .../{ => juju-bundles}/charms/nginx-k8s/lib/ops/lib/__init__.py | 0 .../{ => juju-bundles}/charms/nginx-k8s/lib/ops/log.py | 0 .../{ => juju-bundles}/charms/nginx-k8s/lib/ops/main.py | 0 .../{ => juju-bundles}/charms/nginx-k8s/lib/ops/model.py | 0 .../{ => juju-bundles}/charms/nginx-k8s/lib/ops/testing.py | 0 .../{ => juju-bundles}/charms/nginx-k8s/metadata.yaml | 0 .../{ => juju-bundles}/charms/nginx-k8s/src/charm.py | 0 16 files changed, 1 insertion(+), 1 deletion(-) rename charm-packages/native_k8s_charm_vnf/{ => juju-bundles}/charms/nginx-k8s/actions.yaml (100%) rename charm-packages/native_k8s_charm_vnf/{ => juju-bundles}/charms/nginx-k8s/actions/changecontent (100%) rename charm-packages/native_k8s_charm_vnf/{ => juju-bundles}/charms/nginx-k8s/config.yaml (100%) rename charm-packages/native_k8s_charm_vnf/{ => juju-bundles}/charms/nginx-k8s/hooks/start (100%) rename charm-packages/native_k8s_charm_vnf/{ => juju-bundles}/charms/nginx-k8s/lib/ops/__init__.py (100%) rename charm-packages/native_k8s_charm_vnf/{ => juju-bundles}/charms/nginx-k8s/lib/ops/charm.py (100%) rename charm-packages/native_k8s_charm_vnf/{ => juju-bundles}/charms/nginx-k8s/lib/ops/framework.py (100%) rename charm-packages/native_k8s_charm_vnf/{ => juju-bundles}/charms/nginx-k8s/lib/ops/jujuversion.py (100%) rename charm-packages/native_k8s_charm_vnf/{ => juju-bundles}/charms/nginx-k8s/lib/ops/lib/__init__.py (100%) rename charm-packages/native_k8s_charm_vnf/{ => juju-bundles}/charms/nginx-k8s/lib/ops/log.py (100%) rename charm-packages/native_k8s_charm_vnf/{ => juju-bundles}/charms/nginx-k8s/lib/ops/main.py (100%) rename charm-packages/native_k8s_charm_vnf/{ => juju-bundles}/charms/nginx-k8s/lib/ops/model.py (100%) rename charm-packages/native_k8s_charm_vnf/{ => juju-bundles}/charms/nginx-k8s/lib/ops/testing.py (100%) rename charm-packages/native_k8s_charm_vnf/{ => juju-bundles}/charms/nginx-k8s/metadata.yaml (100%) rename charm-packages/native_k8s_charm_vnf/{ => juju-bundles}/charms/nginx-k8s/src/charm.py (100%) diff --git a/charm-packages/native_k8s_charm_vnf/juju-bundles/bundle.yaml b/charm-packages/native_k8s_charm_vnf/juju-bundles/bundle.yaml index 8115e959..ea862df0 100644 --- a/charm-packages/native_k8s_charm_vnf/juju-bundles/bundle.yaml +++ b/charm-packages/native_k8s_charm_vnf/juju-bundles/bundle.yaml @@ -2,5 +2,5 @@ description: Squid Bundle bundle: kubernetes applications: nginx: - charm: '../charms/nginx-k8s' + charm: './charms/nginx-k8s' scale: 1 diff --git a/charm-packages/native_k8s_charm_vnf/charms/nginx-k8s/actions.yaml b/charm-packages/native_k8s_charm_vnf/juju-bundles/charms/nginx-k8s/actions.yaml similarity index 100% rename from charm-packages/native_k8s_charm_vnf/charms/nginx-k8s/actions.yaml rename to charm-packages/native_k8s_charm_vnf/juju-bundles/charms/nginx-k8s/actions.yaml diff --git a/charm-packages/native_k8s_charm_vnf/charms/nginx-k8s/actions/changecontent b/charm-packages/native_k8s_charm_vnf/juju-bundles/charms/nginx-k8s/actions/changecontent similarity index 100% rename from charm-packages/native_k8s_charm_vnf/charms/nginx-k8s/actions/changecontent rename to charm-packages/native_k8s_charm_vnf/juju-bundles/charms/nginx-k8s/actions/changecontent diff --git a/charm-packages/native_k8s_charm_vnf/charms/nginx-k8s/config.yaml b/charm-packages/native_k8s_charm_vnf/juju-bundles/charms/nginx-k8s/config.yaml similarity index 100% rename from charm-packages/native_k8s_charm_vnf/charms/nginx-k8s/config.yaml rename to charm-packages/native_k8s_charm_vnf/juju-bundles/charms/nginx-k8s/config.yaml diff --git a/charm-packages/native_k8s_charm_vnf/charms/nginx-k8s/hooks/start b/charm-packages/native_k8s_charm_vnf/juju-bundles/charms/nginx-k8s/hooks/start similarity index 100% rename from charm-packages/native_k8s_charm_vnf/charms/nginx-k8s/hooks/start rename to charm-packages/native_k8s_charm_vnf/juju-bundles/charms/nginx-k8s/hooks/start diff --git a/charm-packages/native_k8s_charm_vnf/charms/nginx-k8s/lib/ops/__init__.py b/charm-packages/native_k8s_charm_vnf/juju-bundles/charms/nginx-k8s/lib/ops/__init__.py similarity index 100% rename from charm-packages/native_k8s_charm_vnf/charms/nginx-k8s/lib/ops/__init__.py rename to charm-packages/native_k8s_charm_vnf/juju-bundles/charms/nginx-k8s/lib/ops/__init__.py diff --git a/charm-packages/native_k8s_charm_vnf/charms/nginx-k8s/lib/ops/charm.py b/charm-packages/native_k8s_charm_vnf/juju-bundles/charms/nginx-k8s/lib/ops/charm.py similarity index 100% rename from charm-packages/native_k8s_charm_vnf/charms/nginx-k8s/lib/ops/charm.py rename to charm-packages/native_k8s_charm_vnf/juju-bundles/charms/nginx-k8s/lib/ops/charm.py diff --git a/charm-packages/native_k8s_charm_vnf/charms/nginx-k8s/lib/ops/framework.py b/charm-packages/native_k8s_charm_vnf/juju-bundles/charms/nginx-k8s/lib/ops/framework.py similarity index 100% rename from charm-packages/native_k8s_charm_vnf/charms/nginx-k8s/lib/ops/framework.py rename to charm-packages/native_k8s_charm_vnf/juju-bundles/charms/nginx-k8s/lib/ops/framework.py diff --git a/charm-packages/native_k8s_charm_vnf/charms/nginx-k8s/lib/ops/jujuversion.py b/charm-packages/native_k8s_charm_vnf/juju-bundles/charms/nginx-k8s/lib/ops/jujuversion.py similarity index 100% rename from charm-packages/native_k8s_charm_vnf/charms/nginx-k8s/lib/ops/jujuversion.py rename to charm-packages/native_k8s_charm_vnf/juju-bundles/charms/nginx-k8s/lib/ops/jujuversion.py diff --git a/charm-packages/native_k8s_charm_vnf/charms/nginx-k8s/lib/ops/lib/__init__.py b/charm-packages/native_k8s_charm_vnf/juju-bundles/charms/nginx-k8s/lib/ops/lib/__init__.py similarity index 100% rename from charm-packages/native_k8s_charm_vnf/charms/nginx-k8s/lib/ops/lib/__init__.py rename to charm-packages/native_k8s_charm_vnf/juju-bundles/charms/nginx-k8s/lib/ops/lib/__init__.py diff --git a/charm-packages/native_k8s_charm_vnf/charms/nginx-k8s/lib/ops/log.py b/charm-packages/native_k8s_charm_vnf/juju-bundles/charms/nginx-k8s/lib/ops/log.py similarity index 100% rename from charm-packages/native_k8s_charm_vnf/charms/nginx-k8s/lib/ops/log.py rename to charm-packages/native_k8s_charm_vnf/juju-bundles/charms/nginx-k8s/lib/ops/log.py diff --git a/charm-packages/native_k8s_charm_vnf/charms/nginx-k8s/lib/ops/main.py b/charm-packages/native_k8s_charm_vnf/juju-bundles/charms/nginx-k8s/lib/ops/main.py similarity index 100% rename from charm-packages/native_k8s_charm_vnf/charms/nginx-k8s/lib/ops/main.py rename to charm-packages/native_k8s_charm_vnf/juju-bundles/charms/nginx-k8s/lib/ops/main.py diff --git a/charm-packages/native_k8s_charm_vnf/charms/nginx-k8s/lib/ops/model.py b/charm-packages/native_k8s_charm_vnf/juju-bundles/charms/nginx-k8s/lib/ops/model.py similarity index 100% rename from charm-packages/native_k8s_charm_vnf/charms/nginx-k8s/lib/ops/model.py rename to charm-packages/native_k8s_charm_vnf/juju-bundles/charms/nginx-k8s/lib/ops/model.py diff --git a/charm-packages/native_k8s_charm_vnf/charms/nginx-k8s/lib/ops/testing.py b/charm-packages/native_k8s_charm_vnf/juju-bundles/charms/nginx-k8s/lib/ops/testing.py similarity index 100% rename from charm-packages/native_k8s_charm_vnf/charms/nginx-k8s/lib/ops/testing.py rename to charm-packages/native_k8s_charm_vnf/juju-bundles/charms/nginx-k8s/lib/ops/testing.py diff --git a/charm-packages/native_k8s_charm_vnf/charms/nginx-k8s/metadata.yaml b/charm-packages/native_k8s_charm_vnf/juju-bundles/charms/nginx-k8s/metadata.yaml similarity index 100% rename from charm-packages/native_k8s_charm_vnf/charms/nginx-k8s/metadata.yaml rename to charm-packages/native_k8s_charm_vnf/juju-bundles/charms/nginx-k8s/metadata.yaml diff --git a/charm-packages/native_k8s_charm_vnf/charms/nginx-k8s/src/charm.py b/charm-packages/native_k8s_charm_vnf/juju-bundles/charms/nginx-k8s/src/charm.py similarity index 100% rename from charm-packages/native_k8s_charm_vnf/charms/nginx-k8s/src/charm.py rename to charm-packages/native_k8s_charm_vnf/juju-bundles/charms/nginx-k8s/src/charm.py -- GitLab