Cleanup dependence

Change-Id: I1a985bb5f0ed4c9a5b75263006d0e454a37decf7
2016-10-14 14:51:22 -04:00 · 2016-10-14 14:51:22 -04:00 · 682681a83a
parent 5727ae2c0a
commit 682681a83a
5 changed files with 45 additions and 191 deletions
--- a/README.md
+++ b/README.md
@ -50,95 +50,3 @@ Please select an operation: 1
 ## Test Daisy

 TODO
-
-
-## Prefered version of python modules
-
-
-
-Althrough we are working on catching up with the latest upstream components, currently we still tested building & running Daisy not with the latest upstream python modules but the specific versions list below:
-
-atk-2.8.0-4.el7.x86_64.rpm  
-docutils-0.11-1.noarch.rpm  
-fontawesome-fonts-web-4.1.0-2.el7.noarch.rpm  
-gd-2.0.35-26.el7.x86_64.rpm  
-gdk-pixbuf2-2.28.2-4.el7.x86_64.rpm  
-gettext-common-devel-0.18.2.1-4.el7.noarch.rpm  
-gettext-devel-0.18.2.1-4.el7.x86_64.rpm  
-git-1.8.3.1-4.el7.x86_64.rpm  
-graphite2-1.2.2-5.el7.x86_64.rpm  
-graphviz-2.30.1-19.el7.x86_64.rpm  
-gtk2-2.24.22-5.el7.x86_64.rpm  
-harfbuzz-0.9.20-3.el7.x86_64.rpm  
-hicolor-icon-theme-0.12-7.el7.noarch.rpm  
-intltool-0.50.2-5.el7.noarch.rpm  
-intltool-0.50.2-6.el7.noarch.rpm  
-librsvg2-2.39.0-1.el7.x86_64.rpm  
-libthai-0.1.14-9.el7.x86_64.rpm  
-libtool-ltdl-2.4.2-20.el7.x86_64.rpm  
-libXaw-1.0.11-6.1.el7.x86_64.rpm  
-libXcomposite-0.4.4-4.1.el7.x86_64.rpm  
-libXcursor-1.1.14-2.1.el7.x86_64.rpm  
-libXft-2.3.1-5.1.el7.x86_64.rpm  
-libXi-1.7.2-2.1.el7.x86_64.rpm  
-libXmu-1.1.1-5.1.el7.x86_64.rpm  
-libXpm-3.5.10-5.1.el7.x86_64.rpm  
-libXrandr-1.4.1-2.1.el7.x86_64.rpm  
-pango-1.34.1-5.el7.x86_64.rpm  
-perl-XML-Parser-2.41-10.el7.x86_64.rpm  
-Pygments-2.0.2-1.noarch.rpm  
-python-anyjson-0.3.3-3.el7.noarch.rpm  
-python-boto-2.29.1-1.noarch.rpm  
-python-d2to1-0.2.10-3.el7.noarch.rpm  
-python-django-appconf-0.6-1.el7.noarch.rpm  
-python-django-compressor-1.4-3.el7.noarch.rpm  
-python-django-openstack-auth-1.2.0-4.el7.noarch.rpm  
-python-django-pyscss-1.0.5-2.el7.noarch.rpm  
-python-eventlet-0.17.4-1.el7.noarch.rpm  
-python-greenlet-0.4.2-3.el7.x86_64.rpm  
-python-iso8601-0.1.10-1.el7.noarch.rpm  
-python-jinja2-2.7.2-2.el7.noarch.rpm  
-python-keystoneclient-1.3.0-1.el7.noarch.rpm  
-python-kombu-2.5.16-1.el7.noarch.rpm  
-python-lesscpy-0.9j-4.el7.noarch.rpm  
-python-lockfile-0.9.1-4.el7.noarch.rpm  
-python-migrate-0.8.2-1.el7.noarch.rpm  
-python-oslo-concurrency-1.8.0-1.el7.noarch.rpm  
-python-oslo-config-1.9.3-1.el7.noarch.rpm  
-python-oslo-i18n-1.5.0-3.el7.noarch.rpm  
-python-oslo-serialization-1.4.0-1.el7.noarch.rpm  
-python-oslo-sphinx-2.5.0-2.el7.noarch.rpm  
-python-oslo-utils-1.4.0-1.el7.noarch.rpm  
-python-pbr-0.10.8-1.el7.noarch.rpm  
-python-pint-0.6-2.el7.noarch.rpm  
-python-pip-1.5.6-5.el7.noarch.rpm  
-python-pygments-1.4-9.el7.noarch.rpm  
-python-routes-2.0-1.noarch.rpm  
-python-scss-1.2.1-1.el7.x86_64.rpm  
-python-six-1.9.0-1.el7.noarch.rpm  
-python-sphinx-1.2.2-1.noarch.rpm  
-python-sqlalchemy-0.9.7-3.el7.x86_64.rpm  
-python-webob-1.2.3-8.el7.noarch.rpm  
-python-XStatic-1.0.1-1.el7.noarch.rpm  
-python-XStatic-Angular-1.3.7.0-4.el7.noarch.rpm  
-python-XStatic-Angular-Bootstrap-0.11.0.2-1.el7.noarch.rpm  
-python-XStatic-Angular-lrdragndrop-1.0.2.2-1.el7.noarch.rpm  
-python-XStatic-Angular-Mock-1.2.1.1-2.el7.noarch.rpm  
-python-XStatic-Bootstrap-Datepicker-1.3.1.0-1.el7.noarch.rpm  
-python-XStatic-Bootstrap-SCSS-3.2.0.0-1.el7.noarch.rpm  
-python-XStatic-D3-3.1.6.2-2.el7.noarch.rpm  
-python-XStatic-Font-Awesome-4.1.0.0-4.el7.noarch.rpm  
-python-XStatic-Hogan-2.0.0.2-2.el7.noarch.rpm  
-python-XStatic-Jasmine-1.3.1.1-2.el7.noarch.rpm  
-python-XStatic-jQuery-1.10.2.1-1.el7.noarch.rpm  
-python-XStatic-JQuery-Migrate-1.2.1.1-2.el7.noarch.rpm  
-python-XStatic-JQuery-quicksearch-2.0.3.1-2.el7.noarch.rpm  
-python-XStatic-JQuery-TableSorter-2.14.5.1-2.el7.noarch.rpm  
-python-XStatic-jquery-ui-1.10.4.1-1.el7.noarch.rpm  
-python-XStatic-JSEncrypt-2.0.0.2-2.el7.noarch.rpm  
-python-XStatic-Magic-Search-0.2.0.1-1.el7.noarch.rpm  
-python-XStatic-QUnit-1.14.0.2-2.el7.noarch.rpm  
-python-XStatic-Rickshaw-1.5.0.0-4.el7.noarch.rpm  
-python-XStatic-smart-table-1.4.5.3-1.el7.noarch.rpm  
-python-XStatic-Spin-1.2.5.2-2.el7.noarch.rpm   
-python-XStatic-termjs-0.0.4.2-1.el7.noarch.rpm
--- a/code/daisy/requirements.txt
+++ b/code/daisy/requirements.txt
@ -4,12 +4,6 @@

 pbr>=1.6 # Apache-2.0

-#
-# The greenlet package must be compiled with gcc and needs
-# the Python.h headers. Make sure you install the python-dev
-# package to get the right headers...
-greenlet>=0.3.2
-
 # < 0.8.0/0.8 does not work, see https://bugs.launchpad.net/bugs/1153983
 SQLAlchemy>=0.9.7,<=0.9.99
 anyjson>=0.3.3
--- a/rpm/SPECS/openstack-horizon.spec
+++ b/rpm/SPECS/openstack-horizon.spec
@ -57,14 +57,12 @@ Requires:   python-django


 Requires:   pytz
-Requires:   python-lockfile
 Requires:   python-six >= 1.7.0
 Requires:   python-pbr

 BuildRequires: python2-devel
 BuildRequires: python-setuptools
 BuildRequires: python-pbr >= 0.10.8
-BuildRequires: python-lockfile
 BuildRequires: python-eventlet
 BuildRequires: git
 BuildRequires: python-six >= 1.9.0
--- a/tools/daisy-compile-rpm.sh
+++ b/tools/daisy-compile-rpm.sh
@ -1,85 +1,44 @@
 #!/bin/sh
-yum install -y atk
-yum install -y docutils
-yum install -y fontawesome-fonts-web
-yum install -y gd
-yum install -y gdk-pixbuf2
-yum install -y gettext-common-devel
-yum install -y gettext-devel
-yum install -y git
-yum install -y graphite2
-yum install -y graphviz
-yum install -y gtk2
-yum install -y harfbuzz
-yum install -y hicolor-icon-theme
-yum install -y intltool
-yum install -y librsvg2
-yum install -y libthai
-yum install -y libtool
-yum install -y libXaw
-yum install -y libXcomposite
-yum install -y libXcursor
-yum install -y libXft
-yum install -y libXi
-yum install -y libXmu
-yum install -y libXpm
-yum install -y libXrandr
-yum install -y pango
-yum install -y perl-XML-Parser
-yum install -y Pygments
-yum install -y python-anyjson
-yum install -y python-boto
-yum install -y python-d2to1
-yum install -y python-django-appconf
-yum install -y python-django-compressor
-yum install -y python-django-openstack-auth
-yum install -y python-django-pyscss
-yum install -y python-eventlet
-yum install -y python-eventlet
-yum install -y python-greenlet
-yum install -y python-iso8601
-yum install -y python-jinja2
-yum install -y python-keystoneclient
-yum install -y python-kombu
-yum install -y python-lesscpy
-yum install -y python-lockfile
-yum install -y python-migrate
-yum install -y python-oslo-concurrency
-yum install -y python-oslo-config
-yum install -y python-oslo-i18n
-yum install -y python-oslo-serialization
-yum install -y python-oslo-sphinx
-yum install -y python-oslo-utils
-yum install -y python-pbr
-yum install -y python-pint
-yum install -y python-pygments
-yum install -y python-routes
-yum install -y python-scss
-yum install -y python-six
-yum install -y python-sphinx
-yum install -y python-sqlalchemy
-yum install -y python-sqlalchemy
-yum install -y python-webob
-yum install -y python-XStatic
-yum install -y python-XStatic-Angular
-yum install -y python-XStatic-Angular-Bootstrap
-yum install -y python-XStatic-Angular-lrdragndrop
-yum install -y python-XStatic-Angular-Mock
-yum install -y python-XStatic-Bootstrap-Datepicker
-yum install -y python-XStatic-Bootstrap-SCSS
-yum install -y python-XStatic-D3
-yum install -y python-XStatic-Font-Awesome
-yum install -y python-XStatic-Hogan
-yum install -y python-XStatic-Jasmine
-yum install -y python-XStatic-jQuery
-yum install -y python-XStatic-JQuery-Migrate
-yum install -y python-XStatic-JQuery-quicksearch
-yum install -y python-XStatic-JQuery-TableSorter
-yum install -y python-XStatic-jquery-ui
-yum install -y python-XStatic-JSEncrypt
-yum install -y python-XStatic-Magic-Search
-yum install -y python-XStatic-QUnit
-yum install -y python-XStatic-Rickshaw
-yum install -y python-XStatic-smart-table
-yum install -y python-XStatic-Spin
-yum install -y python-XStatic-termjs
+yum -y install \
+  coreutils \
+  git \
+  intltool \
+  make \
+  rpm \
+  rpm-build \
+  python-sphinx \
+  python-XStatic-Angular \
+  python-XStatic-Angular-Bootstrap \
+  python-XStatic-Angular-lrdragndrop \
+  python-XStatic-Angular-Mock \
+  python-XStatic-Bootstrap-Datepicker \
+  python-XStatic-Bootstrap-SCSS \
+  python-XStatic-D3 \
+  python-XStatic-Font-Awesome \
+  python-XStatic-Hogan \
+  python-XStatic-Jasmine \
+  python-XStatic-jQuery \
+  python-XStatic-JQuery-Migrate \
+  python-XStatic-JQuery-quicksearch \
+  python-XStatic-JQuery-TableSorter \
+  python-XStatic-jquery-ui \
+  python-XStatic-JSEncrypt \
+  python-XStatic-Magic-Search \
+  python-XStatic-QUnit \
+  python-XStatic-Rickshaw \
+  python-XStatic-smart-table \
+  python-XStatic-Spin \
+  python-XStatic-termjs \
+  python2-oslo-sphinx \
+  python2-oslo-messaging \
+  python2-oslo-concurrency \
+  python2-oslo-sphinx \
+  python-devel \
+  python-d2to1 \
+  python-django-compressor \
+  python-django-openstack-auth \
+  python-django-pyscss \
+  python-lesscpy \
+  python-migrate \
+  python-pint \
+  python-routes
--- a/tools/setup/install/install_interface.sh
+++ b/tools/setup/install/install_interface.sh
@ -49,11 +49,8 @@ function all_install
    write_install_log "install fping rpm"
    install_rpm_by_yum "fping"

-    write_install_log "install mariadb-galera-server rpm"
-    install_rpm_by_yum "mariadb-galera-server"
-
-    write_install_log "install mariadb rpm"
-    install_rpm_by_yum "mariadb"
+    write_install_log "install mariadb-server rpm"
+    install_rpm_by_yum "mariadb-server"

    write_install_log "install rabbitmq-server rpm"
    install_rpm_by_yum "rabbitmq-server"
@ -71,8 +68,6 @@ function all_install
    install_rpm_by_yum "daisy"

    write_install_log "install daisy dashboard rpm"
-    install_rpm_by_yum "python-django"
-    install_rpm_by_yum "python-lockfile"
    install_rpm_by_daisy_yum "python-django-horizon"
    install_rpm_by_yum "daisy-dashboard"