diff --git a/.zuul.yaml b/.zuul.yaml index f7e04ed5..5165a59d 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -6,7 +6,6 @@ - stx-release-notes-jobs check: jobs: - - flock-devstack-nfv - openstack-tox-linters - nfv-tox-pep8 - nfv-tox-py27 @@ -16,7 +15,6 @@ - nova-api-proxy-tox-pylint gate: jobs: - - flock-devstack-nfv - openstack-tox-linters - nfv-tox-pep8 - nfv-tox-py27 diff --git a/nfv/centos/build_srpm.data b/nfv/centos/build_srpm.data index f1381bce..a5a37dd4 100755 --- a/nfv/centos/build_srpm.data +++ b/nfv/centos/build_srpm.data @@ -1 +1 @@ -TIS_PATCH_VER=75 +TIS_PATCH_VER=76 diff --git a/nfv/centos/nfv.spec b/nfv/centos/nfv.spec index 0444e05f..960136a1 100755 --- a/nfv/centos/nfv.spec +++ b/nfv/centos/nfv.spec @@ -15,7 +15,7 @@ BuildRequires: python2-pip BuildRequires: python2-wheel %description -Titanium Cloud Config Info +StarlingX Network Function Virtualization %define local_bindir /usr/bin/ %define pythonroot /usr/lib64/python2.7/site-packages diff --git a/nfv/nfv-vim/nfv_vim/webserver/_webserver.py b/nfv/nfv-vim/nfv_vim/webserver/_webserver.py index c0034119..fd15e7f1 100755 --- a/nfv/nfv-vim/nfv_vim/webserver/_webserver.py +++ b/nfv/nfv-vim/nfv_vim/webserver/_webserver.py @@ -52,8 +52,7 @@ class HTTPRequestHandler(BaseHTTPServer.BaseHTTPRequestHandler): self.send_header('Content-Type', 'text/html') self.end_headers() self.wfile.write(f.read()) - - elif self.path == '/windriver-favicon.ico': + elif self.path == '/StarlingX_Icon_RGB_Stacked_2color.png': with open(_webserver_src_dir + '/images' + self.path, 'r') as f: self.send_response(httplib.OK) self.send_header('Content-Type', 'image/x-icon') diff --git a/nfv/nfv-vim/nfv_vim/webserver/css/dashboard-sidebar.css b/nfv/nfv-vim/nfv_vim/webserver/css/dashboard-sidebar.css index b2c7ce79..fd9d8e75 100755 --- a/nfv/nfv-vim/nfv_vim/webserver/css/dashboard-sidebar.css +++ b/nfv/nfv-vim/nfv_vim/webserver/css/dashboard-sidebar.css @@ -42,7 +42,6 @@ .sidebar .branding .brand a { float: none; - background: url('/images/windriver-red-med.png') top center no-repeat; text-indent: inherit; text-align: center; text-decoration: none; diff --git a/nfv/nfv-vim/nfv_vim/webserver/html/index.html b/nfv/nfv-vim/nfv_vim/webserver/html/index.html index 148beef4..182dc3bc 100755 --- a/nfv/nfv-vim/nfv_vim/webserver/html/index.html +++ b/nfv/nfv-vim/nfv_vim/webserver/html/index.html @@ -13,8 +13,8 @@ SPDX-License-Identifier: Apache-2.0 - VIM - Titanium Cloud - + VIM - StarlingX + @@ -40,7 +40,7 @@ SPDX-License-Identifier: Apache-2.0
- Help + Help

@@ -59,7 +59,7 @@ SPDX-License-Identifier: Apache-2.0