Merge pull request #59 from zancas/remove_tarball

remove tarball and dependent code.
F5Networks · Aug 22, 2017 · c4c7dd8 · c4c7dd8
2 parents 618327a + a1037fb
commit c4c7dd8
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 5 deletions.
diff --git a/bin/patch-image.sh b/bin/patch-image.sh
@@ -78,8 +78,8 @@ function validate_packages() {
 }
 
 function validate_inputs() {
-    if ! [ -f $startup_pkg ]; then
-        echo "startup file $startup_pkg does not exist"
+    if ! [ -d $startup_pkg ]; then
+        echo "startup directory $startup_pkg does not exist"
         badusage
     fi
 
@@ -123,8 +123,16 @@ function get_dev() {
 }
 
 function inject_files() {
-    if [ -f $startup_pkg ]; then
-        tar -xf $startup_pkg -C /mnt/bigip-config/
+    if [ -d $startup_pkg ]; then
+        pushd $startup_pkg
+        sha256sum startup os-functions/* > sourceshas
+        tar -vcf - ./* | tar -xf - -C /mnt/bigip-config/
+        cp -a startup /mnt/bigip-config/startup_from_cp
+        cp startup /mnt/bigip-config/startup_from_cp_noa
+        sha256sum /mnt/bigip-config/startup /mnt/bigip-config/os-functions/* > /mnt/bigip-config/posttarsums
+        ls -la /mnt/bigip-config
+        ls -la ./*
+        popd
     fi
 
     if $firstboot_file; then

diff --git a/f5_image_prep/ve_image_sync.py b/f5_image_prep/ve_image_sync.py
@@ -25,7 +25,7 @@
 DISKFORMAT = 'qcow2'
 PATCHTOOL = '/home/imageprep/f5-openstack-image-prep/bin/patch-image.sh'
 STARTUPSCRIPTPKG = \
-    '/home/imageprep/f5-openstack-image-prep/lib/f5_image_prep/startup.tar'
+    '/home/imageprep/f5-openstack-image-prep/lib/f5_image_prep/'
 WORKDIR = os.environ['HOME']
 
 

diff --git a/lib/f5_image_prep/startup.tar b/lib/f5_image_prep/startup.tar