update customize.sh to define ivs_version and use it locally

wolverineav · Oct 15, 2018 · d8e9b0b · d8e9b0b
1 parent 4e0064a
commit d8e9b0b
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 6 deletions.
diff --git a/bosi/rhosp_resources/master/ivs/customize.sh b/bosi/rhosp_resources/master/ivs/customize.sh
@@ -20,8 +20,10 @@ image_dir="/home/stack/images"
 
 virt-customize -a ${image_dir}/overcloud-full.qcow2 --upload neutron-bsn-lldp-${lldp_version}-1.el7.centos.noarch.rpm:/root/
 # enabled for P+V mode
+#ivs_version="TODO set_IVS_version_here_if_deploying_PV_mode"
 #virt-customize -a ${image_dir}/overcloud-full.qcow2 --upload ivs-${ivs_version}.el7.centos.x86_64.rpm:/root/
 #virt-customize -a ${image_dir}/overcloud-full.qcow2 --upload ivs-debuginfo-${ivs_version}.el7.centos.x86_64.rpm:/root/
+#sed -i -e "s/\${ivs_version}/$IVS_VERSION_REVISION/" ./startup.sh
 
 virt-customize -a ${image_dir}/overcloud-full.qcow2 --upload impl_ifcfg.py:/root/
 virt-customize -a ${image_dir}/overcloud-full.qcow2 --firstboot startup.sh
diff --git a/bosi/rhosp_resources/origin/stable/newton/ivs/customize.sh b/bosi/rhosp_resources/origin/stable/newton/ivs/customize.sh
@@ -8,8 +8,11 @@ virt-customize -a ${image_dir}/overcloud-full.qcow2 --upload python-networking-b
 virt-customize -a ${image_dir}/overcloud-full.qcow2 --upload openstack-neutron-bigswitch-lldp-${networking_bigswitch_version}-1.el7.centos.noarch.rpm:/root/
 virt-customize -a ${image_dir}/overcloud-full.qcow2 --upload openstack-neutron-bigswitch-agent-${networking_bigswitch_version}-1.el7.centos.noarch.rpm:/root/
 virt-customize -a ${image_dir}/overcloud-full.qcow2 --upload python-horizon-bsn-${horizon_bsn_version}-1.el7.centos.noarch.rpm:/root/
-virt-customize -a ${image_dir}/overcloud-full.qcow2 --upload ivs-${ivs_version}.el7.centos.x86_64.rpm:/root/
-virt-customize -a ${image_dir}/overcloud-full.qcow2 --upload ivs-debuginfo-${ivs_version}.el7.centos.x86_64.rpm:/root/
+# enabled for P+V mode
+#ivs_version="TODO set_IVS_version_here_if_deploying_PV_mode"
+#virt-customize -a ${image_dir}/overcloud-full.qcow2 --upload ivs-${ivs_version}.el7.centos.x86_64.rpm:/root/
+#virt-customize -a ${image_dir}/overcloud-full.qcow2 --upload ivs-debuginfo-${ivs_version}.el7.centos.x86_64.rpm:/root/
+#sed -i -e "s/\${ivs_version}/$IVS_VERSION_REVISION/" ./startup.sh
 
 virt-customize -a ${image_dir}/overcloud-full.qcow2 --firstboot startup.sh
 
diff --git a/bosi/rhosp_resources/origin/stable/ocata/ivs/customize.sh b/bosi/rhosp_resources/origin/stable/ocata/ivs/customize.sh
@@ -8,8 +8,11 @@ virt-customize -a ${image_dir}/overcloud-full.qcow2 --upload python-networking-b
 virt-customize -a ${image_dir}/overcloud-full.qcow2 --upload openstack-neutron-bigswitch-lldp-${networking_bigswitch_version}-1.el7.centos.noarch.rpm:/root/
 virt-customize -a ${image_dir}/overcloud-full.qcow2 --upload openstack-neutron-bigswitch-agent-${networking_bigswitch_version}-1.el7.centos.noarch.rpm:/root/
 virt-customize -a ${image_dir}/overcloud-full.qcow2 --upload python-horizon-bsn-${horizon_bsn_version}-1.el7.centos.noarch.rpm:/root/
-virt-customize -a ${image_dir}/overcloud-full.qcow2 --upload ivs-${ivs_version}.el7.centos.x86_64.rpm:/root/
-virt-customize -a ${image_dir}/overcloud-full.qcow2 --upload ivs-debuginfo-${ivs_version}.el7.centos.x86_64.rpm:/root/
+# enabled for P+V mode
+#ivs_version="TODO set_IVS_version_here_if_deploying_PV_mode"
+#virt-customize -a ${image_dir}/overcloud-full.qcow2 --upload ivs-${ivs_version}.el7.centos.x86_64.rpm:/root/
+#virt-customize -a ${image_dir}/overcloud-full.qcow2 --upload ivs-debuginfo-${ivs_version}.el7.centos.x86_64.rpm:/root/
+#sed -i -e "s/\${ivs_version}/$IVS_VERSION_REVISION/" ./startup.sh
 
 virt-customize -a ${image_dir}/overcloud-full.qcow2 --firstboot startup.sh
 

diff --git a/bosi/rhosp_resources/origin/stable/pike/ivs/customize.sh b/bosi/rhosp_resources/origin/stable/pike/ivs/customize.sh
@@ -22,8 +22,12 @@ virt-customize -a ${image_dir}/overcloud-full.qcow2 --upload python-networking-b
 virt-customize -a ${image_dir}/overcloud-full.qcow2 --upload openstack-neutron-bigswitch-lldp-${networking_bigswitch_version}-1.el7.centos.noarch.rpm:/root/
 virt-customize -a ${image_dir}/overcloud-full.qcow2 --upload openstack-neutron-bigswitch-agent-${networking_bigswitch_version}-1.el7.centos.noarch.rpm:/root/
 virt-customize -a ${image_dir}/overcloud-full.qcow2 --upload python-horizon-bsn-${horizon_bsn_version}-1.el7.centos.noarch.rpm:/root/
-virt-customize -a ${image_dir}/overcloud-full.qcow2 --upload ivs-${ivs_version}.el7.centos.x86_64.rpm:/root/
-virt-customize -a ${image_dir}/overcloud-full.qcow2 --upload ivs-debuginfo-${ivs_version}.el7.centos.x86_64.rpm:/root/
+
+# enabled for P+V mode
+#ivs_version="TODO set_IVS_version_here_if_deploying_PV_mode"
+#virt-customize -a ${image_dir}/overcloud-full.qcow2 --upload ivs-${ivs_version}.el7.centos.x86_64.rpm:/root/
+#virt-customize -a ${image_dir}/overcloud-full.qcow2 --upload ivs-debuginfo-${ivs_version}.el7.centos.x86_64.rpm:/root/
+#sed -i -e "s/\${ivs_version}/$IVS_VERSION_REVISION/" ./startup.sh
 
 virt-customize -a ${image_dir}/overcloud-full.qcow2 --firstboot startup.sh