Merge pull request bigswitch#508 from wolverineav/master_queens

OSP-228: update BOSI to handle package updates in RHOSP 13
wolverineav · Oct 12, 2018 · e80bb0a · e80bb0a
2 parents 8151c3b + da7658f
commit e80bb0a
Show file tree

Hide file tree

Showing 5 changed files with 55 additions and 12 deletions.
diff --git a/bosi/rhosp_resources/master/yamls/local_registry_images_bigswitch.yaml b/bosi/rhosp_resources/master/yamls/local_registry_images_bigswitch.yaml
@@ -2,11 +2,10 @@
 # REGISTRY_IP is the IP configured as local_ip in undercloud.conf
 
 container_images:
-- imagename: registry.connect.redhat.com/bigswitch/rhosp13-openstack-neutron-server-bigswitch:13.0-1
+- imagename: registry.connect.redhat.com/bigswitch/rhosp13-openstack-neutron-server-bigswitch:13.0-2
+  push_destination: <REGISTRY_IP>:8787
+- imagename: registry.connect.redhat.com/bigswitch/rhosp13-openstack-horizon-bigswitch:13.0-3
   push_destination: <REGISTRY_IP>:8787
-# uncomment once Horizon plugin works fine
-#- imagename: registry.connect.redhat.com/bigswitch/rhosp13-openstack-horizon-bigswitch:13.0-2
-#  push_destination: <REGISTRY_IP>:8787
 # uncomment for PV mode
 #- imagename: registry.connect.redhat.com/bigswitch/rhosp13-openstack-nova-compute-bigswitch:13.0-2
 #  push_destination: <REGISTRY_IP>:8787
diff --git a/bosi/rhosp_resources/master/yamls/overcloud_images_bigswitch.yaml b/bosi/rhosp_resources/master/yamls/overcloud_images_bigswitch.yaml
@@ -2,11 +2,10 @@
 # REGISTRY_IP is the IP configured as local_ip in undercloud.conf
 
 parameter_defaults:
-  DockerNeutronApiImage: <REGISTRY_IP>:8787/bigswitch/rhosp13-openstack-neutron-server-bigswitch:13.0-1
-  DockerNeutronConfigImage: <REGISTRY_IP>:8787/bigswitch/rhosp13-openstack-neutron-server-bigswitch:13.0-1
-# uncomment once Horizon plugin works fine
-#  DockerHorizonImage: <REGISTRY_IP>:8787/bigswitch/rhosp13-openstack-horizon-bigswitch:13.0-2
-#  DockerHorizonConfigImage: <REGISTRY_IP>:8787/bigswitch/rhosp13-openstack-horizon-bigswitch:13.0-2
+  DockerNeutronApiImage: <REGISTRY_IP>:8787/bigswitch/rhosp13-openstack-neutron-server-bigswitch:13.0-2
+  DockerNeutronConfigImage: <REGISTRY_IP>:8787/bigswitch/rhosp13-openstack-neutron-server-bigswitch:13.0-2
+  DockerHorizonImage: <REGISTRY_IP>:8787/bigswitch/rhosp13-openstack-horizon-bigswitch:13.0-3
+  DockerHorizonConfigImage: <REGISTRY_IP>:8787/bigswitch/rhosp13-openstack-horizon-bigswitch:13.0-3
 # uncomment for PV mode  
 #  DockerNeutronBigswitchAgentImage: <REGISTRY_IP>:8787/bigswitch/rhosp13-openstack-neutron-server-bigswitch:13.0-1
 #  DockerNovaComputeImage: <REGISTRY_IP>:8787/bigswitch/rhosp13-openstack-nova-compute-bigswitch:13.0-2

diff --git a/etc/t5/bash_template/redhat_7_upgrade.sh b/etc/t5/bash_template/redhat_7_upgrade.sh
@@ -19,6 +19,9 @@ is_controller=%(is_controller)s
 controller() {
 
     PKGS=/tmp/upgrade/*
+
+    # the first four packages are applicable for RHOSP releases upto Pike
+    # i.e. RHOSP 12
     for pkg in $PKGS
     do
         if [[ $pkg == *"python-networking-bigswitch"* ]]; then
@@ -64,12 +67,26 @@ controller() {
             break
         fi
     done
-
+    # Following packages are applicable for Queens release i.e. RHOSP 13
+    # and above
+    for pkg in $PKGS
+    do
+        if [[ $pkg == *"neutron-bsn-lldp"* ]]; then
+            yum remove -y neutron-bsn-lldp
+            rpm -ivhU $pkg --force
+            systemctl daemon-reload
+            systemctl enable  neutron-bsn-lldp
+            systemctl restart neutron-bsn-lldp
+            break
+        fi
+    done
 }
 
 compute() {
 
     PKGS=/tmp/upgrade/*
+    # First 3 packages are applicable for openstack releases until Pike
+    # i.e. RHOSP 12 and below
     for pkg in $PKGS
     do
         if [[ $pkg == *"python-networking-bigswitch"* ]]; then
@@ -102,6 +119,19 @@ compute() {
             break
         fi
     done
+    # Following package is applicable for Queens release i.e. RHOSP 13
+    # and above
+    for pkg in $PKGS
+    do
+        if [[ $pkg == *"neutron-bsn-lldp"* ]]; then
+            yum remove -y neutron-bsn-lldp
+            rpm -ivhU $pkg --force
+            systemctl daemon-reload
+            systemctl enable  neutron-bsn-lldp
+            systemctl restart neutron-bsn-lldp
+            break
+        fi
+    done
 }
 
 

diff --git a/etc/t6/bash_template/redhat_7_upgrade.sh b/etc/t6/bash_template/redhat_7_upgrade.sh
@@ -19,6 +19,9 @@ is_controller=%(is_controller)s
 controller() {
 
     PKGS=/tmp/upgrade/*
+
+    # the first four packages are applicable for RHOSP releases upto Pike
+    # i.e. RHOSP 12
     for pkg in $PKGS
     do
         if [[ $pkg == *"python-networking-bigswitch"* ]]; then
@@ -65,7 +68,19 @@ controller() {
             break
         fi
     done
-
+    # Following packages are applicable for Queens release i.e. RHOSP 13
+    # and above
+    for pkg in $PKGS
+    do
+        if [[ $pkg == *"neutron-bsn-lldp"* ]]; then
+            yum remove -y neutron-bsn-lldp
+            rpm -ivhU $pkg --force
+            systemctl daemon-reload
+            systemctl enable  neutron-bsn-lldp
+            systemctl restart neutron-bsn-lldp
+            break
+        fi
+    done
 }
 
 compute() {

diff --git a/setup.cfg b/setup.cfg
@@ -1,6 +1,6 @@
 [metadata]
 name = bosi
-version = 0.0.216
+version = 0.0.217
 summary = Big Switch Networks OpenStack Installer
 description-file =
     README.rst