divius pushed to openstack-ironic-discoverd (master). "Release 1.1.0"

[notifications at fedoraproject.org]

>From 64451c6384135d1a82084ad71ca409e8c60f7d8c Mon Sep 17 00:00:00 2001
From: Dmitry Tantsur <divius.inside at gmail.com>
Date: Thu, 30 Apr 2015 09:29:52 +0200
Subject: Release 1.1.0


diff --git a/0001-default-database-location.patch b/0001-default-database-location.patch
index 401e04a..87892fe 100644
--- a/0001-default-database-location.patch
+++ b/0001-default-database-location.patch
@@ -1,25 +1,37 @@
+From a13e7e24ab87d219b50fc36356e01eccc09342b4 Mon Sep 17 00:00:00 2001
+From: Dmitry Tantsur <dtantsur at redhat.com>
+Date: Tue, 24 Mar 2015 17:12:20 +0100
+Subject: [PATCH] Add default database file location
+
+Change-Id: Ia6fc880deb6db1c543045881c7ca9262185f62a3
+---
+ example.conf             | 2 +-
+ ironic_discoverd/conf.py | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
 diff --git a/example.conf b/example.conf
-index 51424f8..805ecae 100644
+index 0b805dc..0bf86c1 100644
 --- a/example.conf
 +++ b/example.conf
-@@ -64,7 +64,7 @@
+@@ -85,7 +85,7 @@
  
- ; SQLite3 database to store nodes under introspection, required.
- ; Do not use :memory: here, it won't work.
--;database =
-+;database = /var/lib/ironic-discoverd/discoverd.sqlite
- ; Comma-separated list of enabled hooks for processing pipeline.
- ; Hook 'scheduler' updates the node with the minimum properties required by the
- ; Nova scheduler. Hook 'validate_interfaces' ensures that valid NIC data was
+ # SQLite3 database to store nodes under introspection, required. Do
+ # not use :memory: here, it won't work. (string value)
+-#database =
++#database = /var/lib/ironic-discoverd/discoverd.sqlite
+ 
+ # Comma-separated list of enabled hooks for processing pipeline. Hook
+ # 'scheduler' updates the node with the minimum properties required by
 diff --git a/ironic_discoverd/conf.py b/ironic_discoverd/conf.py
-index 000d691..3ee94ff 100644
+index 1a907fe..69962ba 100644
 --- a/ironic_discoverd/conf.py
 +++ b/ironic_discoverd/conf.py
-@@ -41,6 +41,7 @@ DEFAULTS = {
-     # General service settings
-     'processing_hooks': 'scheduler,validate_interfaces',
-     'debug': 'false',
-+    'database': '/var/lib/ironic-discoverd/discoverd.sqlite',
- }
- 
- 
+@@ -96,7 +96,7 @@ SERVICE_OPTS = [
+                      'endpoints. Note that introspection ramdisk postback '
+                      'endpoint is never authenticated.'),
+     cfg.StrOpt('database',
+-               default='',
++               default='/var/lib/ironic-discoverd/discoverd.sqlite',
+                help='SQLite3 database to store nodes under introspection, '
+                     'required. Do not use :memory: here, it won\'t work.'),
+     cfg.StrOpt('processing_hooks',
diff --git a/openstack-ironic-discoverd.spec b/openstack-ironic-discoverd.spec
index 771db2e..ccba3fa 100644
--- a/openstack-ironic-discoverd.spec
+++ b/openstack-ironic-discoverd.spec
@@ -2,7 +2,7 @@
 
 Name:		openstack-ironic-discoverd
 Summary:	Hardware introspection service for OpenStack Ironic
-Version:	1.0.2
+Version:	1.1.0
 Release:	1%{?dist}
 License:	ASL 2.0
 Group:		System Environment/Base
@@ -54,14 +54,21 @@ install -p -D -m 644 %{SOURCE3} %{buildroot}/%{_sysconfdir}/ironic-discoverd/dns
 
 %package -n python-ironic-discoverd
 Summary: Hardware introspection service for OpenStack Ironic - Python modules
+Requires: python-babel
+Requires: python-cliff
 Requires: python-eventlet
 Requires: python-flask
 Requires: python-ironicclient
 Requires: python-keystoneclient
 Requires: python-keystonemiddleware
+Requires: python-oslo-config
+Requires: python-oslo-i18n
+Requires: python-oslo-utils
+Requires: python-openstackclient
 Requires: python-requests
 Requires: python-setuptools
 Requires: python-six
+Requires: python-stevedore
 Conflicts: openstack-ironic-discoverd < 1.0.0-1
 
 %description -n python-ironic-discoverd
@@ -111,6 +118,9 @@ This package contains main executable and service files.
 
 %changelog
 
+* Thu Apr 30 2015 Dmitry Tantsur <dtantsur at redhat.com> - 1.1.0-1
+- New upstream release: 1.1.0
+
 * Tue Mar 3 2015 Dmitry Tantsur <dtantsur at redhat.com> - 1.0.2-1
 - New upstream bugfix release: 1.0.2
 - Remove requirements.txt before building
diff --git a/sources b/sources
index 0ca45db..856c2f2 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-2c0c0aba080749795a1f2623b5fe69e8  ironic-discoverd-1.0.2.tar.gz
+8991faa384e4ef4b8e38b0e0296e0fa6  ironic-discoverd-1.1.0.tar.gz
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/openstack-ironic-discoverd.git/commit/?h=master&id=64451c6384135d1a82084ad71ca409e8c60f7d8c