Merge pull request bigswitch#510 from wolverineav/master_queens

yaml and customize script changes for clarity
wolverineav · Oct 15, 2018 · 3779af4 · 3779af4
2 parents e80bb0a + d8e9b0b
commit 3779af4
Show file tree

Hide file tree

Showing 8 changed files with 22 additions and 10 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/master/yamls/bigswitch-config-pv.yaml b/bosi/rhosp_resources/master/yamls/bigswitch-config-pv.yaml
@@ -11,7 +11,7 @@ parameter_defaults:
   ControllerExtraConfig:
     neutron::agents::bigswitch::lldp_enabled: true
   NeutronMechanismDrivers: openvswitch,bsn_ml2
-  NeutronServicePlugins: bsn_l3,bsn_service_plugin
+  NeutronServicePlugins: bsn_l3,bsn_service_plugin,qos,trunk
   KeystoneNotificationDriver: messaging
 
   ComputeExtraConfig:

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/newton/yamls/bigswitch-config-pv.yaml b/bosi/rhosp_resources/origin/stable/newton/yamls/bigswitch-config-pv.yaml
@@ -14,7 +14,7 @@ parameter_defaults:
     neutron::agents::dhcp::enable_metadata_network: false
     neutron::server::l3_ha: false
   NeutronMechanismDrivers: openvswitch,bsn_ml2
-  NeutronServicePlugins: bsn_l3,bsn_service_plugin
+  NeutronServicePlugins: bsn_l3,bsn_service_plugin,qos,trunk
   KeystoneNotificationDriver: messaging
 
   NovaComputeExtraConfig:

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/ocata/yamls/bigswitch-config-pv.yaml b/bosi/rhosp_resources/origin/stable/ocata/yamls/bigswitch-config-pv.yaml
@@ -16,7 +16,7 @@ parameter_defaults:
     neutron::agents::dhcp::enable_metadata_network: false
     neutron::server::l3_ha: false
   NeutronMechanismDrivers: openvswitch,bsn_ml2
-  NeutronServicePlugins: bsn_l3,bsn_service_plugin
+  NeutronServicePlugins: bsn_l3,bsn_service_plugin,qos,trunk
   KeystoneNotificationDriver: messaging
 
   NovaComputeExtraConfig:

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
 

diff --git a/bosi/rhosp_resources/origin/stable/pike/yamls/bigswitch-config-pv.yaml b/bosi/rhosp_resources/origin/stable/pike/yamls/bigswitch-config-pv.yaml
@@ -16,7 +16,7 @@ parameter_defaults:
     neutron::agents::dhcp::enable_metadata_network: false
     neutron::server::l3_ha: false
   NeutronMechanismDrivers: openvswitch,bsn_ml2
-  NeutronServicePlugins: bsn_l3,bsn_service_plugin
+  NeutronServicePlugins: bsn_l3,bsn_service_plugin,qos,trunk
   KeystoneNotificationDriver: messaging
 
   NovaComputeExtraConfig: