Merge pull request #4634 from c-po/aws-glb-package

T7671: move AWS GLB CLI configuration to a separate package

4 files changed, 37 insertions, 6 deletions

diff --git a/.gitignore b/.gitignore
index abdc5eb7d..e0e830d75 100644
--- a/.gitignore
+++ b/.gitignore
@@ -118,6 +118,7 @@ debian/.debhelper/
 debian/vyos-1x
 debian/vyos-1x-vmware
 debian/vyos-1x-smoketest
+debian/vyos-1x-aws
 debian/*.postinst.debhelper
 debian/*.prerm.debhelper
 debian/*.postrm.debhelper
diff --git a/debian/control b/debian/control
index 90158b1db..f5853ba2c 100644
--- a/debian/control
+++ b/debian/control
@@ -199,8 +199,6 @@ Depends:
   console-data,
   dropbear,
 # End "service console-server"
-# For "service aws glb"
-  aws-gwlbtun,
 # For "service dns dynamic"
   ddclient (>= 3.11.1),
 # End "service dns dynamic"
@@ -393,13 +391,15 @@ Depends:
 Description: VyOS configuration scripts and data
  VyOS configuration scripts, interface definitions, and everything
 
-Package: vyos-1x-vmware
+Package: vyos-1x-aws
 Architecture: all
 Depends:
  vyos-1x,
- open-vm-tools
-Description: VyOS configuration scripts and data for VMware
- Adds configuration files required for VyOS running on VMware hosts.
+# For "service aws glb"
+ aws-gwlbtun,
+Description: VyOS configuration scripts and data for AWS Gateway Load Balancer
+ Adds configuration files required for AWS Gateway Load Balancer service
+ running on top of VyOS.
 
 Package: vyos-1x-smoketest
 Architecture: all
@@ -408,3 +408,11 @@ Depends:
  snmp,
  vyos-1x
 Description: VyOS build sanity checking toolkit
+
+Package: vyos-1x-vmware
+Architecture: all
+Depends:
+ vyos-1x,
+ open-vm-tools
+Description: VyOS configuration scripts and data for VMware
+ Adds configuration files required for VyOS running on VMware hosts.
diff --git a/debian/rules b/debian/rules
index f579ffec9..7341bb15a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,6 +1,7 @@
 #!/usr/bin/make -f
 
 DIR := debian/tmp
+DIR_AWS := $(DIR)/vyos-1x-aws
 VYOS_SBIN_DIR := usr/sbin
 VYOS_BIN_DIR := usr/bin
 VYOS_LIBEXEC_DIR := usr/libexec/vyos
@@ -36,6 +37,9 @@ override_dh_auto_install:
 
 	cd python; python3 setup.py install --install-layout=deb --root ../$(DIR); cd ..
 
+	# Remove all __pycache__ directories before installing
+	find . -type d -name '__pycache__' -exec rm -rf {} +
+
 	# Install scripts
 	mkdir -p $(DIR)/$(VYOS_SBIN_DIR)
 	mkdir -p $(DIR)/$(VYOS_BIN_DIR)
@@ -143,6 +147,21 @@ override_dh_auto_install:
 	mkdir -p $(DIR)/usr/lib/udev
 	cp src/helpers/vyos_net_name $(DIR)/usr/lib/udev
 
+	# vyos-1x-aws package
+	# Move some files to dedicated DEB packages
+	#
+	mkdir -p $(DIR_AWS)/lib/systemd/system
+	mv $(DIR)/lib/systemd/system/aws-gwlbtun.service $(DIR_AWS)/lib/systemd/system
+
+	mkdir -p $(DIR_AWS)/opt/vyatta/share/vyatta-cfg/templates/service
+	mv $(DIR)/opt/vyatta/share/vyatta-cfg/templates/service/aws $(DIR_AWS)/opt/vyatta/share/vyatta-cfg/templates/service
+
+	mkdir -p $(DIR_AWS)/usr/libexec/vyos/conf_mode
+	mv $(DIR)/usr/libexec/vyos/conf_mode/service_aws_glb.py $(DIR_AWS)/usr/libexec/vyos/conf_mode
+
+	mkdir -p $(DIR_AWS)/usr/share/vyos/templates
+	mv $(DIR)/usr/share/vyos/templates/aws/ $(DIR_AWS)/usr/share/vyos/templates
+
 override_dh_installsystemd:
 	dh_installsystemd -pvyos-1x --name vyos-router vyos-router.service
 	dh_installsystemd -pvyos-1x --name vyos vyos.target
diff --git a/debian/vyos-1x-aws.install b/debian/vyos-1x-aws.install
new file mode 100644
index 000000000..57a9d29f9
--- /dev/null
+++ b/debian/vyos-1x-aws.install
@@ -0,0 +1,3 @@
+vyos-1x-aws/lib/* /lib
+vyos-1x-aws/opt/* /opt
+vyos-1x-aws/usr/* /usr