Browse Source

add python-bsn-neutronclient to tarball

 - this is a new package to be installed on undercloud to provide
   various neutron CLI commands for our plugin
 - primarily force-bcf-sync and bcf-sync-status
 - also adds neutron-bsn-lldp and updated customize and startup
   scripts

Change-Id: I4cfb2f7c2bd7044d8bbd36f5c558b7a70cecc5dc
tags/14.0.0
Aditya Prakash Vaja 8 months ago
parent
commit
e3ea6b94a5
1 changed files with 22 additions and 6 deletions
  1. 22
    6
      build_packages/openstack_networking_bigswitch_tagged.build

+ 22
- 6
build_packages/openstack_networking_bigswitch_tagged.build View File

@@ -117,24 +117,40 @@ OUTDIR=$(readlink -m "pkg/$BIGTOP_PARTIAL_PATH")
117 117
 rm -rf "$OUTDIR" && mkdir -p "$OUTDIR"
118 118
 cp $BUILDDIR/RPMS/noarch/*.rpm "$OUTDIR"
119 119
 
120
+# helper method to get version number
121
+get_version () {
122
+    RPM=$1;
123
+    B=${RPM##*/};
124
+    B=${B%-*};
125
+    V=${B##*-};
126
+}
127
+
120 128
 # build a single tar with all plugin RPM files and yamls
121 129
 DATE=`date +%Y-%m-%d-%H-%M`
122 130
 ALL_RPM_YAML_TAR_DIR="$RHOSP_REL_NAME-$OSP_REL_NAME-PLUGINS-$DATE"
123 131
 ALL_RPM_YAML_TAR_GZ="$ALL_RPM_YAML_TAR_DIR.tar.gz"
124 132
 # 1. get yamls and customize scripts from BOSI
125 133
 mkdir bosi
126
-mkdir tarball
127 134
 rsync -e 'ssh -o "StrictHostKeyChecking no"' -uva  bigtop:public_html/bosi/4.0.0/latest/* ./bosi
128 135
 mv ./bosi/rhosp_resources/$GIT_BRANCH/yamls ./$ALL_RPM_YAML_TAR_DIR
129 136
 mv ./bosi/rhosp_resources/$GIT_BRANCH/ivs/* ./$ALL_RPM_YAML_TAR_DIR
130 137
 
131
-# 2. get horizon rpm from bigtop
132
-rsync -e 'ssh -o "StrictHostKeyChecking no"' -uva  bigtop:public_html/horizon-bsn/centos7-x86_64/$GIT_BRANCH/latest/*.noarch.rpm ./tarball
138
+# 2. get neutron-bsn-lldp *.noarch.rpm from bigtop
139
+rsync -e 'ssh -o "StrictHostKeyChecking no"' -uva bigtop:public_html/neutron-bsn-lldp/centos7-x86_64/origin/master/latest/*.noarch.rpm ./$ALL_RPM_YAML_TAR_DIR
140
+LLDP_PKG="`ls ./$ALL_RPM_YAML_TAR_DIR/neutron-bsn-lldp*`"
141
+get_version $LLDP_PKG
142
+LLDP_VERSION=$V
143
+echo "neutron-bsn-lldp version is" $LLDP_VERSION
144
+
145
+# 3. update startup.sh and customize.sh with neutron-bsn-lldp pkg version
146
+sed -i -e "s/\${lldp_version}/$LLDP_VERSION/" ./$ALL_RPM_YAML_TAR_DIR/customize.sh
147
+sed -i -e "s/\${lldp_version}/$LLDP_VERSION/" ./$ALL_RPM_YAML_TAR_DIR/startup.sh
148
+sed -i -e "s/\${lldp_version}/$LLDP_VERSION/" ./$ALL_RPM_YAML_TAR_DIR/README
133 149
 
134
-# 3. get all neutron plugin *.noarch.rpms
135
-cp $BUILDDIR/RPMS/noarch/*.rpm ./$ALL_RPM_YAML_TAR_DIR
150
+# 4. get python-bsn-neutronclient*.noarch.rpm from bigtop
151
+rsync -e 'ssh -o "StrictHostKeyChecking no"' -uva bigtop:public_html/python-bsn-neutronclient/centos7-x86_64/origin/stable/queens/latest/*.noarch.rpm ./$ALL_RPM_YAML_TAR_DIR
136 152
 
137
-# 4. build a tarball and put it at $OUTDIR
153
+# 5. build a tarball and put it at $OUTDIR
138 154
 tar -zcvf $OUTDIR/$ALL_RPM_YAML_TAR_GZ $ALL_RPM_YAML_TAR_DIR
139 155
 cp dist/*.tar.gz "$OUTDIR"
140 156
 git log > "$OUTDIR/gitlog.txt"

Loading…
Cancel
Save