From 4e0064a62268d19ea19cd35a4db1e14e2726b121 Mon Sep 17 00:00:00 2001 From: Aditya Prakash Vaja Date: Mon, 15 Oct 2018 22:03:01 +0530 Subject: [PATCH 1/2] add qos,trunk for PV mode service plugins --- bosi/rhosp_resources/master/yamls/bigswitch-config-pv.yaml | 2 +- .../origin/stable/newton/yamls/bigswitch-config-pv.yaml | 2 +- .../origin/stable/ocata/yamls/bigswitch-config-pv.yaml | 2 +- .../origin/stable/pike/yamls/bigswitch-config-pv.yaml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/bosi/rhosp_resources/master/yamls/bigswitch-config-pv.yaml b/bosi/rhosp_resources/master/yamls/bigswitch-config-pv.yaml index d86d6bf..fce0f6c 100644 --- 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/yamls/bigswitch-config-pv.yaml b/bosi/rhosp_resources/origin/stable/newton/yamls/bigswitch-config-pv.yaml index 5778f96..60de593 100644 --- 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/yamls/bigswitch-config-pv.yaml b/bosi/rhosp_resources/origin/stable/ocata/yamls/bigswitch-config-pv.yaml index 0341896..a5c54d3 100644 --- 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/yamls/bigswitch-config-pv.yaml b/bosi/rhosp_resources/origin/stable/pike/yamls/bigswitch-config-pv.yaml index 0341896..a5c54d3 100644 --- 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: From d8e9b0b27b679135ee663948fc9ae4e3a5603562 Mon Sep 17 00:00:00 2001 From: Aditya Prakash Vaja Date: Mon, 15 Oct 2018 22:56:37 +0530 Subject: [PATCH 2/2] update customize.sh to define ivs_version and use it locally --- bosi/rhosp_resources/master/ivs/customize.sh | 2 ++ .../rhosp_resources/origin/stable/newton/ivs/customize.sh | 7 +++++-- bosi/rhosp_resources/origin/stable/ocata/ivs/customize.sh | 7 +++++-- bosi/rhosp_resources/origin/stable/pike/ivs/customize.sh | 8 ++++++-- 4 files changed, 18 insertions(+), 6 deletions(-) diff --git a/bosi/rhosp_resources/master/ivs/customize.sh b/bosi/rhosp_resources/master/ivs/customize.sh index eb45e2a..44b4db7 100755 --- 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 index 626412d..30499ea 100644 --- 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 index 0c71b8f..52640a0 100644 --- 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 index edeacc0..c9ba06a 100755 --- 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