Fix Heat specs

* update requirements;
* fix specs (rename oslosphinx);
* remove old conf files;
* fix init scripts for CentOS (explicitly setting config file)

Change-Id: I3cc83646583100704ba1beeb5c12823b996ec4e0

diff --git a/debian/changelog b/debian/changelog
index 733f101c363253578c70b4e0c402e2ebb3d1d8bf..3375dc5388be41a1f0cf76e214fbf97c81381d6e 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+heat (2014.2.b3-0ubuntu1) trusty; urgency=medium
+
+  *  update for global requirements
+  *  fix init script (explicitly setting config file)
+
+ -- Denis Egorenko <degorenko@mirantis.com>  Wed, 17 Sep 2014 19:46:19 +0400
+
 heat (2014.2~b1-0ubuntu1) trusty; urgency=medium
 
   * updated for LP BP build from master

diff --git a/debian/control b/debian/control
index 6b736d9b82570c0a9c18c5f8a8e5706d4d579433..ffd5b905b33d914bf9a2a80b16ab7f6429a2a77c 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -75,40 +75,40 @@ Architecture: all
 Depends:
  python-argparse,
  python-babel (>= 1.3),
- python-eventlet (>= 0.13.0),
+ python-eventlet (>= 0.15.1),
  python-greenlet (>= 0.3.2),
  python-httplib2 (>= 0.7.5),
  python-iso8601 (>= 0.1.9),
  python-keystonemiddleware (>= 1.0.0),
  python-kombu (>= 2.4.8),
  python-lxml (>= 2.3),
- python-netaddr (>= 0.7.6),
+ python-netaddr (>= 0.7.12),
  python-oslo.config (>= 1.4.0),
- python-oslo.i18n (>= 0.2.0),
- python-oslo.messaging (>= 1.3.0),
- python-oslo.db (>= 0.2.0),
+ python-oslo.i18n (>= 1.0.0),
+ python-oslo.messaging (>= 1.4.0),
+ python-oslo.db (>= 1.0.0),
  python-pastedeploy (>= 1.5.0),
  python-pbr (>= 0.6), python-pbr (<< 0.7) | python-pbr (>> 0.7),
  python-posix-ipc,
  python-crypto (>= 2.6),
  python-ceilometerclient (>= 1.0.6),
  python-cinderclient (>= 1.0.7),
- python-glanceclient (>= 0.13.1),
+ python-glanceclient (>= 0.14.0),
  python-heatclient (>= 0.2.9),
- python-keystoneclient (>= 0.9.0),
- python-neutronclient (>= 1:2.3.5),
- python-novaclient (>= 2.17.0),
- python-saharaclient (>= 0.6.0),
- python-swiftclient (>= 2.0.2),
+ python-keystoneclient (>= 0.10.0),
+ python-neutronclient (>= 1:2.3.6),
+ python-novaclient (>= 2.18.0),
+ python-saharaclient (>= 0.7.3),
+ python-swiftclient (>= 2.2.0),
  python-troveclient (>= 1.0.4),
  python-yaml (>= 3.1.0),
  python-qpid,
- python-requests (>= 1.1),
+ python-requests (>= 1.2.1), python-requests ( << 2.4.0) | python-requests (>> 2.4.0),
  python-routes (>= 1.12.3), python-routes ( << 2.0) | python-routes (>> 2.0),
  python-six (>= 1.7.0),
- python-sqlalchemy (>= 0.7.8), python-sqlalchemy (<< 0.9.5) | python-sqlalchemy (>> 0.9.5),
- python-migrate (>= 0.9.1),
- python-stevedore (>= 0.14),
+ python-sqlalchemy (>= 0.8.4), python-sqlalchemy (<< 0.8.99) | python-sqlalchemy (>= 0.9.7), python-sqlalchemy ( << 0.9.99),
+ python-migrate (>= 0.9.1), python-migrate ( << 0.9.2) | python-migrate (>> 0.9.2),
+ python-stevedore (>= 1.0.0),
  python-webob (>= 1.2.3),
  python-boto (>= 2.4),
  python-extras,

diff --git a/rpm/SOURCES/heat-dist.conf b/rpm/SOURCES/heat-dist.conf
deleted file mode 100644 (file)
index 77250ab..0000000
--- a/rpm/SOURCES/heat-dist.conf
+++ /dev/null
@@ -1,42 +0,0 @@
-[DEFAULT]
-sql_connection = mysql://heat:heat@localhost/heat
-heat_metadata_server_url = http://127.0.0.1:8000
-heat_waitcondition_server_url = http://127.0.0.1:8000/v1/waitcondition
-heat_watch_server_url = http://127.0.0.1:8003
-db_backend = heat.db.sqlalchemy.api
-log_dir = /var/log/heat
-rpc_backend = heat.openstack.common.rpc.impl_qpid
-use_stderr = False
-
-[keystone_authtoken]
-admin_tenant_name = %SERVICE_TENANT_NAME%
-admin_user = %SERVICE_USER%
-admin_password = %SERVICE_PASSWORD%
-auth_host = 127.0.0.1
-auth_port = 35357
-auth_protocol = http
-auth_uri = http://127.0.0.1:5000/v2.0
-signing_dir = /tmp/keystone-signing-heat
-
-[ssl]
-
-[database]
-
-[paste_deploy]
-api_paste_config = /usr/share/heat/api-paste-dist.ini
-
-[rpc_notifier2]
-
-[ec2authtoken]
-
-[heat_api_cloudwatch]
-
-[heat_api]
-
-[heat_api_cfn]
-
-[auth_password]
-
-[matchmaker_ring]
-
-[matchmaker_redis]

diff --git a/rpm/SOURCES/openstack-heat-api-cfn.init b/rpm/SOURCES/openstack-heat-api-cfn.init
index acdf1c5e5a5185dcaca837716ece8137af422491..29f34eeffafeb599548afee934e4712167fbf199 100644 (file)
--- a/rpm/SOURCES/openstack-heat-api-cfn.init
+++ b/rpm/SOURCES/openstack-heat-api-cfn.init
@@ -23,6 +23,7 @@
 prog=openstack-heat-api-cfn
 exec="/usr/bin/heat-api-cfn"
 config="/etc/heat/heat.conf"
+args="--config-file ${config}"
 pidfile="/var/run/heat/$prog.pid"
 
 [ -e /etc/sysconfig/$prog ] && . /etc/sysconfig/$prog
@@ -33,7 +34,7 @@ start() {
     [ -x $exec ] || exit 5
     [ -f $config ] || exit 6
     echo -n $"Starting $prog: "
-    daemon --user heat --pidfile $pidfile "$exec &>/dev/null & echo \$! > $pidfile"
+    daemon --user heat --pidfile $pidfile "$exec $args &>/dev/null & echo \$! > $pidfile"
     retval=$?
     echo
     [ $retval -eq 0 ] && touch $lockfile

diff --git a/rpm/SOURCES/openstack-heat-api-cloudwatch.init b/rpm/SOURCES/openstack-heat-api-cloudwatch.init
index fd8f77032ce0b87554cd494f15d1346eb49a8e3a..ffbf0148b45a2adfbb1adeb614affaeeef280dd6 100644 (file)
--- a/rpm/SOURCES/openstack-heat-api-cloudwatch.init
+++ b/rpm/SOURCES/openstack-heat-api-cloudwatch.init
@@ -21,6 +21,7 @@
 prog=openstack-heat-api-cloudwatch
 exec="/usr/bin/heat-api-cloudwatch"
 config="/etc/heat/heat.conf"
+args="--config-file ${config}"
 pidfile="/var/run/heat/$prog.pid"
 
 [ -e /etc/sysconfig/$prog ] && . /etc/sysconfig/$prog
@@ -31,7 +32,7 @@ start() {
     [ -x $exec ] || exit 5
     [ -f $config ] || exit 6
     echo -n $"Starting $prog: "
-    daemon --user heat --pidfile $pidfile "$exec &>/dev/null & echo \$! > $pidfile"
+    daemon --user heat --pidfile $pidfile "$exec $args &>/dev/null & echo \$! > $pidfile"
     retval=$?
     echo
     [ $retval -eq 0 ] && touch $lockfile

diff --git a/rpm/SOURCES/openstack-heat-api.init b/rpm/SOURCES/openstack-heat-api.init
index bfed9953f116c5162a05a68fbf4ca812abe85a36..74b641bfcdefe3c5ce67b441b36bb4a69aa24433 100644 (file)
--- a/rpm/SOURCES/openstack-heat-api.init
+++ b/rpm/SOURCES/openstack-heat-api.init
@@ -23,6 +23,7 @@
 prog=openstack-heat-api
 exec="/usr/bin/heat-api"
 config="/etc/heat/heat.conf"
+args="--config-file ${config}"
 pidfile="/var/run/heat/$prog.pid"
 
 [ -e /etc/sysconfig/$prog ] && . /etc/sysconfig/$prog
@@ -33,7 +34,7 @@ start() {
     [ -x $exec ] || exit 5
     [ -f $config ] || exit 6
     echo -n $"Starting $prog: "
-    daemon --user heat --pidfile $pidfile "$exec &>/dev/null & echo \$! > $pidfile"
+    daemon --user heat --pidfile $pidfile "$exec $args &>/dev/null & echo \$! > $pidfile"
     retval=$?
     echo
     [ $retval -eq 0 ] && touch $lockfile

diff --git a/rpm/SOURCES/openstack-heat-engine.init b/rpm/SOURCES/openstack-heat-engine.init
index 573937cfe9b2d8ff1641b7c59fd7268ccc523bb7..98c75ad353d22cf06835f5b4528107c886542e00 100644 (file)
--- a/rpm/SOURCES/openstack-heat-engine.init
+++ b/rpm/SOURCES/openstack-heat-engine.init
@@ -21,6 +21,7 @@
 prog=openstack-heat-engine
 exec="/usr/bin/heat-engine"
 config="/etc/heat/heat.conf"
+args="--config-file ${config}"
 pidfile="/var/run/heat/$prog.pid"
 
 [ -e /etc/sysconfig/$prog ] && . /etc/sysconfig/$prog
@@ -31,7 +32,7 @@ start() {
     [ -x $exec ] || exit 5
     [ -f $config ] || exit 6
     echo -n $"Starting $prog: "
-    daemon --user heat --pidfile $pidfile "$exec &>/dev/null & echo \$! > $pidfile"
+    daemon --user heat --pidfile $pidfile "$exec $args &>/dev/null & echo \$! > $pidfile"
     retval=$?
     echo
     [ $retval -eq 0 ] && touch $lockfile

diff --git a/rpm/SPECS/openstack-heat.spec b/rpm/SPECS/openstack-heat.spec
index 28614529360b019f66e4c929d3cc38350e7df2d0..2ef434d470c20b730d53f3218e1348a0a2782c95 100644 (file)
--- a/rpm/SPECS/openstack-heat.spec
+++ b/rpm/SPECS/openstack-heat.spec
@@ -1,13 +1,13 @@
-%global release_name juno-1
+%global release_name juno-3
 %global release_letter rc
-%global milestone 2
+%global milestone 3
 %global full_release heat-%{version}
 
 %global with_doc %{!?_without_doc:1}%{?_without_doc:0}
 
 Name:          openstack-heat
 Summary:       OpenStack Orchestration (heat)
-Version:       2014.2.b1
+Version:       2014.2.b3
 Release:       2.1%{?dist}
 License:       ASL 2.0
 Group:         System Environment/Base
@@ -21,7 +21,6 @@ Source2:      openstack-heat-api.init
 Source3:       openstack-heat-api-cfn.init
 Source4:       openstack-heat-engine.init
 Source5:       openstack-heat-api-cloudwatch.init
-Source20:   heat-dist.conf
 
 #
 # patches_base=2014.2.b1
@@ -35,7 +34,7 @@ BuildRequires: git
 BuildRequires: python2-devel
 BuildRequires: python-setuptools
 BuildRequires: python-babel >= 1.3
-BuildRequires: python-stevedore >= 0.14
+BuildRequires: python-stevedore >= 1.0.0
 BuildRequires: python-oslo-sphinx
 BuildRequires: python-argparse
 BuildRequires: python-eventlet
@@ -56,16 +55,16 @@ BuildRequires: python-sphinx >= 1.2.1, python-sphinx < 1.3
 # These are required to build due to the requirements check added
 BuildRequires: python-paste-deploy >= 1.5.0
 BuildRequires: python-routes >= 1.12.3, python-routes < 2.0
-BuildRequires: python-sqlalchemy >= 0.7.8, python-sqlalchemy <= 0.9.99
+BuildRequires: python-sqlalchemy >= 0.8.4, python-sqlalchemy <= 0.9.99
 BuildRequires: python-webob >= 1.2.3
 
 BuildRequires: python-pbr
 BuildRequires: python-d2to1
 %if 0%{?with_doc}
-BuildRequires: python-oslo-i18n >= 0.2.0
+BuildRequires: python-oslo-i18n >= 1.0.0
 BuildRequires: python-oslo-config >= 1.4.0
-BuildRequires: python-oslo-messaging >= 1.3.0
-BuildRequires: python-oslo-db >= 0.2.0
+BuildRequires: python-oslo-messaging >= 1.4.0
+BuildRequires: python-oslo-db >= 1.0.0
 BuildRequires: python-saharaclient
 BuildRequires: python-cinderclient
 BuildRequires: python-keystoneclient
@@ -93,9 +92,6 @@ Requires: %{name}-api-cloudwatch = %{version}-%{release}
 sed -i s/REDHATHEATVERSION/%{version}/ heat/version.py
 sed -i s/REDHATHEATRELEASE/%{release}/ heat/version.py
 
-# make doc build compatible with python-oslo-sphinx RPM
-sed -i 's/oslosphinx/oslo.sphinx/' doc/source/conf.py
-
 # Remove the requirements file so that pbr hooks don't add it
 # to distutils requires_dist config
 rm -rf {test-,}requirements.txt tools/{pip,test}-requires
@@ -157,7 +153,6 @@ rm -f %{buildroot}/usr/bin/cinder-keystone-setup
 rm -rf %{buildroot}/%{python_sitelib}/heat/tests
 
 install -p -D -m 640 %{_builddir}/%{full_release}/etc/heat/heat.conf.sample %{buildroot}/%{_sysconfdir}/heat/heat.conf
-install -p -D -m 640 %{SOURCE20} %{buildroot}%{_datadir}/heat/heat-dist.conf
 install -p -D -m 640 %{_builddir}/%{full_release}/etc/heat/api-paste.ini %{buildroot}/%{_sysconfdir}/heat/api-paste.ini
 install -p -D -m 640 etc/heat/policy.json %{buildroot}/%{_sysconfdir}/heat
 
@@ -174,40 +169,40 @@ Summary: Heat common
 Group: System Environment/Base
 Requires: python-argparse
 Requires: python-babel >= 1.3
-Requires: python-eventlet >= 0.13.0
+Requires: python-eventlet >= 0.15.1
 Requires: python-greenlet >= 0.3.2
 Requires: python-httplib2 >= 0.7.5
 Requires: python-iso8601 >= 0.1.9
 Requires: python-keystonemiddleware >= 1.0.0
 Requires: python-kombu >= 2.4.8
 Requires: python-lxml >= 2.3
-Requires: python-netaddr >= 0.7.6
+Requires: python-netaddr >= 0.7.12
 Requires: python-oslo-config >= 1.4.0
-Requires: python-oslo-messaging >= 1.3.0
-Requires: python-oslo-db >= 0.2.0
-Requires: python-oslo-i18n >= 0.2.0
+Requires: python-oslo-messaging >= 1.4.0
+Requires: python-oslo-db >= 1.0.0
+Requires: python-oslo-i18n >= 1.0.0
 Requires: python-paste-deploy >= 1.5.0
 Requires: python-pbr >= 0.6, python-pbr < 0.7, python-pbr > 0.7, python-pbr < 1.0
 Requires: python-posix_ipc
 Requires: python-crypto >= 2.6
 Requires: python-ceilometerclient >= 1.0.6
 Requires: python-cinderclient >= 1.0.7
-Requires: python-glanceclient >= 0.13.1
+Requires: python-glanceclient >= 0.14.0
 Requires: python-heatclient >= 0.2.9
-Requires: python-keystoneclient >= 0.9.0
-Requires: python-neutronclient >= 2.3.5, python-neutronclient < 3
-Requires: python-novaclient >= 2.17.0
-Requires: python-saharaclient >= 0.6.0
-Requires: python-swiftclient >= 2.0.2
+Requires: python-keystoneclient >= 0.10.0
+Requires: python-neutronclient >= 2.3.6, python-neutronclient < 3
+Requires: python-novaclient >= 2.18.0
+Requires: python-saharaclient >= 0.7.3
+Requires: python-swiftclient >= 2.2.0
 Requires: python-troveclient >= 1.0.4
 Requires: PyYAML >= 3.1.0
 Requires: python-qpid
-Requires: python-requests >= 1.1
+Requires: python-requests >= 1.2.1, python-requests < 2.4.0, python-requests > 2.4.0
 Requires: python-routes >= 1.12.3, python-routes < 2.0, python-routes > 2.0
 Requires: python-six >= 1.7.0
-Requires: python-sqlalchemy >= 0.7.8, python-sqlalchemy < 0.9.5, python-sqlalchemy > 0.9.5, python-sqlalchemy <= 0.9.99
-Requires: python-migrate >= 0.9.1
-Requires: python-stevedore >= 0.14
+Requires: python-sqlalchemy >= 0.8.4, python-sqlalchemy <= 0.8.99, python-sqlalchemy >= 0.9.7, python-sqlalchemy <= 0.9.99
+Requires: python-migrate >= 0.9.1, python-migrate < 0.9.2, python-migrate > 0.9.2
+Requires: python-stevedore >= 1.0.0
 Requires: python-webob >= 1.2.3
 
 Requires: python-memcached
@@ -226,7 +221,6 @@ Components common to all OpenStack Heat services
 %{_bindir}/heat-keystone-setup
 %{_bindir}/heat-keystone-setup-domain
 %{python_sitelib}/heat*
-%attr(-, root, heat) %{_datadir}/heat/heat-dist.conf
 %dir %attr(0755,heat,root) %{_localstatedir}/log/heat
 %dir %attr(0755,heat,root) %{_localstatedir}/run/heat
 %dir %attr(0755,heat,root) %{_sharedstatedir}/heat
@@ -239,6 +233,7 @@ Components common to all OpenStack Heat services
 %config(noreplace) %attr(-,root,heat) %{_sysconfdir}/heat/templates/*
 %if 0%{?with_doc}
 %{_mandir}/man1/heat-keystone-setup.1.gz
+%{_mandir}/man1/heat-keystone-setup-domain.1.gz
 %{_mandir}/man1/heat-manage.1.gz
 %endif
 
@@ -410,6 +405,10 @@ fi
 
 
 %changelog
+* Wed Sep 17 2014 Denis Egorenko <degorenko@mirantis.com> - 2014.2.b2
+- update for global requirements
+- fix init script (explicitly setting config file)
+
 * Wed Jul 1 2014 Igor Yozhikov <iyozhikov@mirantis.com> - 2014.2
 - updated for LP BP