Fix patch for heat requirements

Change-Id: I6a2dbc1419e8f5ed05900adc23550e236c777208

diff --git a/.gitreview b/.gitreview
new file mode 100644 (file)
index 0000000..bbaba7c
--- /dev/null
+++ b/.gitreview
@@ -0,0 +1,5 @@
+[gerrit]
+host=gerrit.mirantis.com
+port=29418
+project=openstack-ci/openstack/heat-build
+defaultbranch=master

diff --git a/debian/control b/debian/control
index 756208b71c42d015ace2c2bbf7cf5481f2ee506b..6dc84f3712caf23406bab2fb06b082cae4c79792 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -41,6 +41,7 @@ Build-Depends-Indep:
  python-novaclient,
  python-oslo.config,
  python-oslo.config,
+ python-oslo.i18n,
  python-oslo.messaging,
  python-oslo.db,
  python-oslosphinx,
@@ -49,6 +50,7 @@ Build-Depends-Indep:
  python-pastedeploy,
  python-routes,
  python-requests,
+ python-saharaclient,
  python-setuptools,
  python-six,
  python-sphinx (>= 1.1.2), python-sphinx (<< 1.2.0) | python-sphinx (>> 1.2.0),

diff --git a/rpm/SOURCES/0002-Add-compatability-patch-to-allow-smooth-migration-aw.patch b/rpm/SOURCES/0002-Add-compatability-patch-to-allow-smooth-migration-aw.patch
index 420ef58448adf51abf549c60c0f1539f8426ef3b..3a0d6300aeba7728613492ee8ec81a3465883fec 100644 (file)
--- a/rpm/SOURCES/0002-Add-compatability-patch-to-allow-smooth-migration-aw.patch
+++ b/rpm/SOURCES/0002-Add-compatability-patch-to-allow-smooth-migration-aw.patch
@@ -72,15 +72,15 @@ diff --git a/requirements.txt b/requirements.txt
 index eb33166..7da29a2 100644
 --- a/requirements.txt
 +++ b/requirements.txt
-@@ -6,6 +6,7 @@ httplib2>=0.7.5
- iso8601>=0.1.9
+@@ -7,6 +7,7 @@ iso8601>=0.1.9
+ keystonemiddleware>=1.0.0
  kombu>=2.4.8
  lxml>=2.3
 +M2Crypto
  netaddr>=0.7.6
  oslo.config>=1.4.0.0a3
  oslo.db>=0.2.0  # Apache-2.0
-@@ -13,7 +14,6 @@ oslo.messaging>=1.3.0
+@@ -15,7 +16,6 @@ oslo.messaging>=1.3.0
  PasteDeploy>=1.5.0
  pbr>=0.6,!=0.7,<1.0
  posix_ipc

diff --git a/rpm/SPECS/openstack-heat.spec b/rpm/SPECS/openstack-heat.spec
index 5befcd29f2ffa4e0a0f02255fb65c1d51603dd33..86b319f2fcf60bda9c06c6d094a22380a99be253 100644 (file)
--- a/rpm/SPECS/openstack-heat.spec
+++ b/rpm/SPECS/openstack-heat.spec
@@ -63,8 +63,10 @@ BuildRequires: python-pbr
 BuildRequires: python-d2to1
 %if 0%{?with_doc}
 BuildRequires: python-oslo-config >= 1.2.0
+BuildRequires: python-oslo-i18n
 BuildRequires: python-oslo-messaging >= 1.3.0
 BuildRequires: python-oslo-db >= 0.2.0
+BuildRequires: python-saharaclient
 BuildRequires: python-cinderclient
 BuildRequires: python-keystoneclient
 BuildRequires: python-novaclient