M #-: move old appliance code to /appliances/legacy/ + tiny fixes

OpenNebula · Dec 22, 2023 · 864511a · 864511a
1 parent cf307c7
commit 864511a
Show file tree

Hide file tree

Showing 46 changed files with 31 additions and 25 deletions.
diff --git a/appliances/OneKE/appliance.sh → appliances/legacy/OneKE/appliance.sh b/appliances/OneKE/appliance.sh → appliances/legacy/OneKE/appliance.sh
diff --git a/appliances/OneKE/appliance/.rubocop.yml → ...ances/legacy/OneKE/appliance/.rubocop.yml b/appliances/OneKE/appliance/.rubocop.yml → ...ances/legacy/OneKE/appliance/.rubocop.yml
diff --git a/appliances/OneKE/appliance/appliance.rb → ...ances/legacy/OneKE/appliance/appliance.rb b/appliances/OneKE/appliance/appliance.rb → ...ances/legacy/OneKE/appliance/appliance.rb
diff --git a/appliances/OneKE/appliance/calico.rb → appliances/legacy/OneKE/appliance/calico.rb b/appliances/OneKE/appliance/calico.rb → appliances/legacy/OneKE/appliance/calico.rb
diff --git a/appliances/OneKE/appliance/canal.rb → appliances/legacy/OneKE/appliance/canal.rb b/appliances/OneKE/appliance/canal.rb → appliances/legacy/OneKE/appliance/canal.rb
diff --git a/appliances/OneKE/appliance/cilium.rb → appliances/legacy/OneKE/appliance/cilium.rb b/appliances/OneKE/appliance/cilium.rb → appliances/legacy/OneKE/appliance/cilium.rb
diff --git a/appliances/OneKE/appliance/cilium_spec.rb → ...ces/legacy/OneKE/appliance/cilium_spec.rb b/appliances/OneKE/appliance/cilium_spec.rb → ...ces/legacy/OneKE/appliance/cilium_spec.rb
diff --git a/appliances/OneKE/appliance/cleaner.rb → appliances/legacy/OneKE/appliance/cleaner.rb b/appliances/OneKE/appliance/cleaner.rb → appliances/legacy/OneKE/appliance/cleaner.rb
diff --git a/appliances/OneKE/appliance/cleaner_spec.rb → ...es/legacy/OneKE/appliance/cleaner_spec.rb b/appliances/OneKE/appliance/cleaner_spec.rb → ...es/legacy/OneKE/appliance/cleaner_spec.rb
diff --git a/appliances/OneKE/appliance/config.rb → appliances/legacy/OneKE/appliance/config.rb b/appliances/OneKE/appliance/config.rb → appliances/legacy/OneKE/appliance/config.rb
diff --git a/appliances/OneKE/appliance/helpers.rb → appliances/legacy/OneKE/appliance/helpers.rb b/appliances/OneKE/appliance/helpers.rb → appliances/legacy/OneKE/appliance/helpers.rb
diff --git a/appliances/OneKE/appliance/helpers_spec.rb → ...es/legacy/OneKE/appliance/helpers_spec.rb b/appliances/OneKE/appliance/helpers_spec.rb → ...es/legacy/OneKE/appliance/helpers_spec.rb
diff --git a/appliances/OneKE/appliance/kubernetes.rb → ...nces/legacy/OneKE/appliance/kubernetes.rb b/appliances/OneKE/appliance/kubernetes.rb → ...nces/legacy/OneKE/appliance/kubernetes.rb
diff --git a/appliances/OneKE/appliance/longhorn.rb → ...iances/legacy/OneKE/appliance/longhorn.rb b/appliances/OneKE/appliance/longhorn.rb → ...iances/legacy/OneKE/appliance/longhorn.rb
diff --git a/appliances/OneKE/appliance/metallb.rb → appliances/legacy/OneKE/appliance/metallb.rb b/appliances/OneKE/appliance/metallb.rb → appliances/legacy/OneKE/appliance/metallb.rb
diff --git a/appliances/OneKE/appliance/metallb_spec.rb → ...es/legacy/OneKE/appliance/metallb_spec.rb b/appliances/OneKE/appliance/metallb_spec.rb → ...es/legacy/OneKE/appliance/metallb_spec.rb
diff --git a/appliances/OneKE/appliance/multus.rb → appliances/legacy/OneKE/appliance/multus.rb b/appliances/OneKE/appliance/multus.rb → appliances/legacy/OneKE/appliance/multus.rb
diff --git a/appliances/OneKE/appliance/onegate.rb → appliances/legacy/OneKE/appliance/onegate.rb b/appliances/OneKE/appliance/onegate.rb → appliances/legacy/OneKE/appliance/onegate.rb
diff --git a/appliances/OneKE/appliance/onegate_spec.rb → ...es/legacy/OneKE/appliance/onegate_spec.rb b/appliances/OneKE/appliance/onegate_spec.rb → ...es/legacy/OneKE/appliance/onegate_spec.rb
diff --git a/appliances/OneKE/appliance/traefik.rb → appliances/legacy/OneKE/appliance/traefik.rb b/appliances/OneKE/appliance/traefik.rb → appliances/legacy/OneKE/appliance/traefik.rb
diff --git a/appliances/OneKE/appliance/vnf.rb → appliances/legacy/OneKE/appliance/vnf.rb b/appliances/OneKE/appliance/vnf.rb → appliances/legacy/OneKE/appliance/vnf.rb
diff --git a/...nces/lib/artifacts/vnf/ha-check-status.sh → ...gacy/lib/artifacts/vnf/ha-check-status.sh b/...nces/lib/artifacts/vnf/ha-check-status.sh → ...gacy/lib/artifacts/vnf/ha-check-status.sh
diff --git a/appliances/lib/artifacts/vnf/ha-failover.sh → ...s/legacy/lib/artifacts/vnf/ha-failover.sh b/appliances/lib/artifacts/vnf/ha-failover.sh → ...s/legacy/lib/artifacts/vnf/ha-failover.sh
diff --git a/...es/lib/artifacts/vnf/kea-config-generator → ...cy/lib/artifacts/vnf/kea-config-generator b/...es/lib/artifacts/vnf/kea-config-generator → ...cy/lib/artifacts/vnf/kea-config-generator
diff --git a/...ib/artifacts/vnf/one-vnf/lib/appliance.rb → ...ib/artifacts/vnf/one-vnf/lib/appliance.rb b/...ib/artifacts/vnf/one-vnf/lib/appliance.rb → ...ib/artifacts/vnf/one-vnf/lib/appliance.rb
diff --git a/...facts/vnf/one-vnf/lib/appliance/plugin.rb → ...facts/vnf/one-vnf/lib/appliance/plugin.rb b/...facts/vnf/one-vnf/lib/appliance/plugin.rb → ...facts/vnf/one-vnf/lib/appliance/plugin.rb
diff --git a/...vnf/one-vnf/lib/appliance/plugin/dummy.rb → ...vnf/one-vnf/lib/appliance/plugin/dummy.rb b/...vnf/one-vnf/lib/appliance/plugin/dummy.rb → ...vnf/one-vnf/lib/appliance/plugin/dummy.rb
diff --git a/...f/one-vnf/lib/appliance/plugin/haproxy.rb → ...f/one-vnf/lib/appliance/plugin/haproxy.rb b/...f/one-vnf/lib/appliance/plugin/haproxy.rb → ...f/one-vnf/lib/appliance/plugin/haproxy.rb
diff --git a/...-vnf/lib/appliance/plugin/loadbalancer.rb → ...-vnf/lib/appliance/plugin/loadbalancer.rb b/...-vnf/lib/appliance/plugin/loadbalancer.rb → ...-vnf/lib/appliance/plugin/loadbalancer.rb
diff --git a/...nf/one-vnf/lib/appliance/plugin/sdnat4.rb → ...nf/one-vnf/lib/appliance/plugin/sdnat4.rb b/...nf/one-vnf/lib/appliance/plugin/sdnat4.rb → ...nf/one-vnf/lib/appliance/plugin/sdnat4.rb
diff --git a/...nces/lib/artifacts/vnf/one-vnf/one-vnf.rb → ...gacy/lib/artifacts/vnf/one-vnf/one-vnf.rb b/...nces/lib/artifacts/vnf/one-vnf/one-vnf.rb → ...gacy/lib/artifacts/vnf/one-vnf/one-vnf.rb
diff --git a/...kea-2.2.0/kea-hook-onelease4-1.1.1-r0.apk → ...kea-2.2.0/kea-hook-onelease4-1.1.1-r0.apk b/...kea-2.2.0/kea-hook-onelease4-1.1.1-r0.apk → ...kea-2.2.0/kea-hook-onelease4-1.1.1-r0.apk
diff --git a/appliances/lib/common.sh → appliances/legacy/lib/common.sh b/appliances/lib/common.sh → appliances/legacy/lib/common.sh
diff --git a/appliances/lib/context-helper.py → appliances/legacy/lib/context-helper.py b/appliances/lib/context-helper.py → appliances/legacy/lib/context-helper.py
diff --git a/appliances/lib/functions.sh → appliances/legacy/lib/functions.sh b/appliances/lib/functions.sh → appliances/legacy/lib/functions.sh
diff --git a/appliances/scripts/context_service_net-90.sh → .../legacy/scripts/context_service_net-90.sh b/appliances/scripts/context_service_net-90.sh → .../legacy/scripts/context_service_net-90.sh
diff --git a/appliances/scripts/context_service_net-99.sh → .../legacy/scripts/context_service_net-99.sh b/appliances/scripts/context_service_net-99.sh → .../legacy/scripts/context_service_net-99.sh
diff --git a/appliances/service → appliances/legacy/service b/appliances/service → appliances/legacy/service
diff --git a/appliances/vnf.sh → appliances/legacy/vnf.sh b/appliances/vnf.sh → appliances/legacy/vnf.sh
diff --git a/appliances/wordpress.sh → appliances/legacy/wordpress.sh b/appliances/wordpress.sh → appliances/legacy/wordpress.sh
diff --git a/packer/service_OneKE/OneKE.pkr.hcl b/packer/service_OneKE/OneKE.pkr.hcl
@@ -68,37 +68,37 @@ build {
   }
 
   provisioner "file" {
-    source      = "appliances/scripts/context_service_net-90.sh"
+    source      = "appliances/legacy/scripts/context_service_net-90.sh"
     destination = "/etc/one-appliance/net-90"
   }
 
   provisioner "file" {
-    source      = "appliances/scripts/context_service_net-99.sh"
+    source      = "appliances/legacy/scripts/context_service_net-99.sh"
     destination = "/etc/one-appliance/net-99"
   }
 
   provisioner "file" {
-    source      = "appliances/service"
+    source      = "appliances/legacy/service"
     destination = "/etc/one-appliance/service"
   }
 
   provisioner "file" {
-    source      = "appliances/lib/common.sh"
+    source      = "appliances/legacy/lib/common.sh"
     destination = "/etc/one-appliance/service.d/common.sh"
   }
 
   provisioner "file" {
-    source      = "appliances/lib/functions.sh"
+    source      = "appliances/legacy/lib/functions.sh"
     destination = "/etc/one-appliance/service.d/functions.sh"
   }
 
   provisioner "file" {
-    source      = "appliances/lib/context-helper.py"
+    source      = "appliances/legacy/lib/context-helper.py"
     destination = "/opt/one-appliance/bin/context-helper"
   }
 
   provisioner "file" {
-    source      = "appliances/OneKE/"
+    source      = "appliances/legacy/OneKE/"
     destination = "/etc/one-appliance/service.d/"
   }
 

diff --git a/packer/service_vnf/10-update.sh b/packer/service_vnf/10-update.sh
@@ -1,4 +1,12 @@
 #!/usr/bin/env sh
-service haveged stop
+
+exec 1>&2
+set -o errexit -o nounset -o pipefail
+set -x
+
+service haveged stop ||:
+
 apk update
 apk --no-cache add bash
+
+sync
diff --git a/packer/service_vnf/variables.pkr.hcl b/packer/service_vnf/variables.pkr.hcl
@@ -20,4 +20,3 @@ variable "version" {
   type    = string
   default = ""
 }
-
diff --git a/packer/service_vnf/vnf.pkr.hcl b/packer/service_vnf/vnf.pkr.hcl
@@ -67,42 +67,42 @@ build {
 
   provisioner "file" {
     destination = "/etc/one-appliance/net-90"
-    source      = "appliances/scripts/context_service_net-90.sh"
+    source      = "appliances/legacy/scripts/context_service_net-90.sh"
   }
 
   provisioner "file" {
     destination = "/etc/one-appliance/net-99"
-    source      = "appliances/scripts/context_service_net-99.sh"
+    source      = "appliances/legacy/scripts/context_service_net-99.sh"
   }
 
   provisioner "file" {
     destination = "/etc/one-appliance/service"
-    source      = "appliances/service"
+    source      = "appliances/legacy/service"
   }
 
   provisioner "file" {
     destination = "/etc/one-appliance/service.d/common.sh"
-    source      = "appliances/lib/common.sh"
+    source      = "appliances/legacy/lib/common.sh"
   }
 
   provisioner "file" {
     destination = "/etc/one-appliance/service.d/functions.sh"
-    source      = "appliances/lib/functions.sh"
+    source      = "appliances/legacy/lib/functions.sh"
   }
 
   provisioner "file" {
     destination = "/opt/one-appliance/bin/context-helper"
-    source      = "appliances/lib/context-helper.py"
+    source      = "appliances/legacy/lib/context-helper.py"
   }
 
   provisioner "file" {
     destination = "/etc/one-appliance/service.d/appliance.sh"
-    source      = "appliances/vnf.sh"
+    source      = "appliances/legacy/vnf.sh"
   }
 
   provisioner "file" {
     destination = "/opt/one-appliance/"
-    source      = "appliances/lib/artifacts/vnf"
+    source      = "appliances/legacy/lib/artifacts/vnf"
   }
 
   provisioner "shell" {

diff --git a/packer/service_wordpress/variables.pkr.hcl b/packer/service_wordpress/variables.pkr.hcl
@@ -20,4 +20,3 @@ variable "version" {
   type    = string
   default = ""
 }
-
diff --git a/packer/service_wordpress/wordpress.pkr.hcl b/packer/service_wordpress/wordpress.pkr.hcl
@@ -65,37 +65,37 @@ build {
   }
 
   provisioner "file" {
-    source      = "appliances/scripts/context_service_net-90.sh"
+    source      = "appliances/legacy/scripts/context_service_net-90.sh"
     destination = "/etc/one-appliance/net-90"
   }
 
   provisioner "file" {
-    source      = "appliances/scripts/context_service_net-99.sh"
+    source      = "appliances/legacy/scripts/context_service_net-99.sh"
     destination = "/etc/one-appliance/net-99"
   }
 
   provisioner "file" {
-    source      = "appliances/service"
+    source      = "appliances/legacy/service"
     destination = "/etc/one-appliance/service"
   }
 
   provisioner "file" {
-    source      = "appliances/lib/common.sh"
+    source      = "appliances/legacy/lib/common.sh"
     destination = "/etc/one-appliance/service.d/common.sh"
   }
 
   provisioner "file" {
-    source      = "appliances/lib/functions.sh"
+    source      = "appliances/legacy/lib/functions.sh"
     destination = "/etc/one-appliance/service.d/functions.sh"
   }
 
   provisioner "file" {
-    source      = "appliances/lib/context-helper.py"
+    source      = "appliances/legacy/lib/context-helper.py"
     destination = "/opt/one-appliance/bin/context-helper"
   }
 
   provisioner "file" {
-    source      = "appliances/wordpress.sh"
+    source      = "appliances/legacy/wordpress.sh"
     destination = "/etc/one-appliance/service.d/appliance.sh"
   }
Original file line number	Diff line number	Diff line change
Expand Up		@@ -20,4 +20,3 @@ variable "version" {
		type = string
		default = ""
		}