From a91528db4b76cf507d4ee8846415ac227f9aa1d5 Mon Sep 17 00:00:00 2001 From: Filip Pytloun Date: Wed, 20 Apr 2016 14:26:48 +0200 Subject: [PATCH 01/14] Initial commit --- debian/changelog | 5 +++++ debian/compat | 1 + debian/control | 26 ++++++++++++++++++++++++++ debian/copyright | 27 +++++++++++++++++++++++++++ debian/docs | 1 + debian/gbp.conf | 8 ++++++++ debian/rules | 7 +++++++ debian/source/format | 1 + debian/watch | 3 +++ 9 files changed, 79 insertions(+) create mode 100644 debian/changelog create mode 100644 debian/compat create mode 100644 debian/control create mode 100644 debian/copyright create mode 100644 debian/docs create mode 100644 debian/gbp.conf create mode 100755 debian/rules create mode 100644 debian/source/format create mode 100644 debian/watch diff --git a/debian/changelog b/debian/changelog new file mode 100644 index 0000000..ac38850 --- /dev/null +++ b/debian/changelog @@ -0,0 +1,5 @@ +salt-formula-keystone (2016.4.1-1) UNRELEASED; urgency=medium + + * Initial release (Closes: #821460) + + -- Filip Pytloun Mon, 18 Apr 2016 16:03:21 +0200 diff --git a/debian/compat b/debian/compat new file mode 100644 index 0000000..ec63514 --- /dev/null +++ b/debian/compat @@ -0,0 +1 @@ +9 diff --git a/debian/control b/debian/control new file mode 100644 index 0000000..33a1197 --- /dev/null +++ b/debian/control @@ -0,0 +1,26 @@ +Source: salt-formula-keystone +Maintainer: PKG OpenStack +Uploaders: Filip Pytloun , +Section: admin +Priority: extra +Build-Depends: debhelper (>= 9), + openstack-pkg-tools, +Build-Depends-Indep: python-all, + python-yaml, + salt-master, +Standards-Version: 3.9.8 +Homepage: https://wiki.openstack.org/wiki/OpenStackSalt +Vcs-Browser: https://anonscm.debian.org/cgit/openstack/salt-formula-keystone.git/ +Vcs-Git: https://anonscm.debian.org/git/openstack/salt-formula-keystone.git + +Package: salt-formula-keystone +Architecture: all +Depends: reclass, + salt-master, + ${misc:Depends}, +Description: Salt formula for OpenStack Ceilometer + Salt is a powerful remote execution manager that can be used to + administer servers in a fast and efficient way. + . + This SaltStack formula manages both installation and configuration of + OpenStack Ceilometer. diff --git a/debian/copyright b/debian/copyright new file mode 100644 index 0000000..6abdafc --- /dev/null +++ b/debian/copyright @@ -0,0 +1,27 @@ +Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: salt-formula-keystone +Source: https://github.com/openstack/salt-formula-keystone + +Files: * +Copyright: 2014-2016 tcp cloud +License: Apache-2.0 + +Files: debian/* +Copyright: (c) 2016, Filip Pytloun +License: Apache-2.0 + +License: Apache-2.0 + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + . + http://www.apache.org/licenses/LICENSE-2.0 + . + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + . + On Debian-based systems the full text of the Apache version 2.0 license + can be found in `/usr/share/common-licenses/Apache-2.0'. diff --git a/debian/docs b/debian/docs new file mode 100644 index 0000000..a1320b1 --- /dev/null +++ b/debian/docs @@ -0,0 +1 @@ +README.rst diff --git a/debian/gbp.conf b/debian/gbp.conf new file mode 100644 index 0000000..7bf5959 --- /dev/null +++ b/debian/gbp.conf @@ -0,0 +1,8 @@ +[DEFAULT] +upstream-branch = master +debian-branch = debian/unstable +upstream-tag = %(version)s +compression = xz + +[buildpackage] +export-dir = ../build-area/ diff --git a/debian/rules b/debian/rules new file mode 100755 index 0000000..f7d5908 --- /dev/null +++ b/debian/rules @@ -0,0 +1,7 @@ +#!/usr/bin/make -f + +include /usr/share/openstack-pkg-tools/pkgos.make + +%: + dh $@ + diff --git a/debian/source/format b/debian/source/format new file mode 100644 index 0000000..163aaf8 --- /dev/null +++ b/debian/source/format @@ -0,0 +1 @@ +3.0 (quilt) diff --git a/debian/watch b/debian/watch new file mode 100644 index 0000000..bff59ae --- /dev/null +++ b/debian/watch @@ -0,0 +1,3 @@ +version=3 +opts="uversionmangle=s/\.(b|rc)/~$1/" \ +https://github.com/openstack/salt-formula-keystone/tags .*/(\d[\d\.]+)\.tar\.gz From 7ac7a9ae9a19527e262758936243e549524da349 Mon Sep 17 00:00:00 2001 From: Filip Pytloun Date: Wed, 20 Apr 2016 14:55:29 +0200 Subject: [PATCH 02/14] ITP bug and fix description --- debian/changelog | 2 +- debian/control | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index ac38850..26973ad 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,5 @@ salt-formula-keystone (2016.4.1-1) UNRELEASED; urgency=medium - * Initial release (Closes: #821460) + * Initial release (Closes: #821919) -- Filip Pytloun Mon, 18 Apr 2016 16:03:21 +0200 diff --git a/debian/control b/debian/control index 33a1197..69ce57d 100644 --- a/debian/control +++ b/debian/control @@ -18,9 +18,9 @@ Architecture: all Depends: reclass, salt-master, ${misc:Depends}, -Description: Salt formula for OpenStack Ceilometer +Description: Salt formula for OpenStack Keystone Salt is a powerful remote execution manager that can be used to administer servers in a fast and efficient way. . This SaltStack formula manages both installation and configuration of - OpenStack Ceilometer. + OpenStack Keystone. From f284a6c287eaed368a377cfbc4162d20367375c2 Mon Sep 17 00:00:00 2001 From: Filip Pytloun Date: Wed, 20 Apr 2016 16:09:03 +0200 Subject: [PATCH 03/14] Release unstable --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 26973ad..3ddb50e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,5 @@ -salt-formula-keystone (2016.4.1-1) UNRELEASED; urgency=medium +salt-formula-keystone (2016.4.1-1) unstable; urgency=medium * Initial release (Closes: #821919) - -- Filip Pytloun Mon, 18 Apr 2016 16:03:21 +0200 + -- Filip Pytloun Wed, 20 Apr 2016 16:04:33 +0200 From 0036e6034a98a43a0d85143a97ed792243fccd54 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Nov=C3=BD?= Date: Sat, 23 Apr 2016 16:35:36 +0200 Subject: [PATCH 04/14] d/copyright: Added myself to Debian part --- debian/changelog | 6 ++++++ debian/copyright | 1 + 2 files changed, 7 insertions(+) diff --git a/debian/changelog b/debian/changelog index 3ddb50e..8f89b2d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +salt-formula-keystone (2016.4.1-2) UNRELEASED; urgency=medium + + * d/copyright: Added myself to Debian part + + -- Filip Pytloun Sat, 23 Apr 2016 16:35:07 +0200 + salt-formula-keystone (2016.4.1-1) unstable; urgency=medium * Initial release (Closes: #821919) diff --git a/debian/copyright b/debian/copyright index 6abdafc..d1b8678 100644 --- a/debian/copyright +++ b/debian/copyright @@ -8,6 +8,7 @@ License: Apache-2.0 Files: debian/* Copyright: (c) 2016, Filip Pytloun + (c) 2016, Ondřej Nový License: Apache-2.0 License: Apache-2.0 From a69d35909211d1f62d2f63b2d875a9c841852962 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Nov=C3=BD?= Date: Sat, 23 Apr 2016 16:37:56 +0200 Subject: [PATCH 05/14] Added myself as uploader --- debian/changelog | 1 + debian/control | 1 + 2 files changed, 2 insertions(+) diff --git a/debian/changelog b/debian/changelog index 8f89b2d..cd06d7c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ salt-formula-keystone (2016.4.1-2) UNRELEASED; urgency=medium * d/copyright: Added myself to Debian part + * Added myself as uploader -- Filip Pytloun Sat, 23 Apr 2016 16:35:07 +0200 diff --git a/debian/control b/debian/control index 69ce57d..45bc5fb 100644 --- a/debian/control +++ b/debian/control @@ -1,6 +1,7 @@ Source: salt-formula-keystone Maintainer: PKG OpenStack Uploaders: Filip Pytloun , + Ondřej Nový , Section: admin Priority: extra Build-Depends: debhelper (>= 9), From 64d435970ebb8d43c58ec22b7029b9e82b935d18 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Nov=C3=BD?= Date: Sat, 23 Apr 2016 18:30:19 +0200 Subject: [PATCH 06/14] Fixed changelog --- debian/changelog | 1 + 1 file changed, 1 insertion(+) diff --git a/debian/changelog b/debian/changelog index cd06d7c..6ba8aad 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,6 @@ salt-formula-keystone (2016.4.1-2) UNRELEASED; urgency=medium + [ Ondřej Nový ] * d/copyright: Added myself to Debian part * Added myself as uploader From 82701e4cbfad71f6f32f49db727b3f3f52505f1e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Nov=C3=BD?= Date: Wed, 11 May 2016 23:51:53 +0200 Subject: [PATCH 07/14] releasing package salt-formula-keystone version 2016.4.1-2 --- debian/changelog | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 6ba8aad..27f1ced 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,9 @@ -salt-formula-keystone (2016.4.1-2) UNRELEASED; urgency=medium +salt-formula-keystone (2016.4.1-2) unstable; urgency=medium - [ Ondřej Nový ] * d/copyright: Added myself to Debian part * Added myself as uploader - -- Filip Pytloun Sat, 23 Apr 2016 16:35:07 +0200 + -- Ondřej Nový Wed, 11 May 2016 23:51:48 +0200 salt-formula-keystone (2016.4.1-1) unstable; urgency=medium From c9343e01345f2e4147fb36fe22b62a1d562dc464 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Nov=C3=BD?= Date: Wed, 8 Jun 2016 21:18:54 +0200 Subject: [PATCH 08/14] Added Debian tests --- debian/changelog | 6 ++++++ debian/tests/control | 2 ++ 2 files changed, 8 insertions(+) create mode 100644 debian/tests/control diff --git a/debian/changelog b/debian/changelog index 27f1ced..cf2c4da 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +salt-formula-keystone (2016.4.1-3) UNRELEASED; urgency=medium + + * Added Debian tests + + -- Ondřej Nový Wed, 08 Jun 2016 21:02:55 +0200 + salt-formula-keystone (2016.4.1-2) unstable; urgency=medium * d/copyright: Added myself to Debian part diff --git a/debian/tests/control b/debian/tests/control new file mode 100644 index 0000000..685e62b --- /dev/null +++ b/debian/tests/control @@ -0,0 +1,2 @@ +Test-Command: cd tests && ./run_tests.sh +Restrictions: allow-stderr From 520781edd43461e4c4ff593f24200ff5cf07da40 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Nov=C3=BD?= Date: Wed, 8 Jun 2016 21:28:19 +0200 Subject: [PATCH 09/14] releasing package salt-formula-keystone version 2016.4.1-3 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index cf2c4da..2c3916a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,8 @@ -salt-formula-keystone (2016.4.1-3) UNRELEASED; urgency=medium +salt-formula-keystone (2016.4.1-3) unstable; urgency=medium * Added Debian tests - -- Ondřej Nový Wed, 08 Jun 2016 21:02:55 +0200 + -- Ondřej Nový Wed, 08 Jun 2016 21:27:20 +0200 salt-formula-keystone (2016.4.1-2) unstable; urgency=medium From 344f7ed8da88881c1b19d3ac056afb81d90ecf7e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Nov=C3=BD?= Date: Mon, 20 Jun 2016 20:15:04 +0200 Subject: [PATCH 10/14] d/{control,copyright}: Use my @debian.org email address --- debian/changelog | 6 ++++++ debian/control | 2 +- debian/copyright | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 2c3916a..407126d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +salt-formula-keystone (2016.4.1-4) UNRELEASED; urgency=medium + + * d/{control,copyright}: Use my @debian.org email address + + -- Ondřej Nový Mon, 20 Jun 2016 20:15:04 +0200 + salt-formula-keystone (2016.4.1-3) unstable; urgency=medium * Added Debian tests diff --git a/debian/control b/debian/control index 45bc5fb..19d03bf 100644 --- a/debian/control +++ b/debian/control @@ -1,7 +1,7 @@ Source: salt-formula-keystone Maintainer: PKG OpenStack Uploaders: Filip Pytloun , - Ondřej Nový , + Ondřej Nový , Section: admin Priority: extra Build-Depends: debhelper (>= 9), diff --git a/debian/copyright b/debian/copyright index d1b8678..1a342df 100644 --- a/debian/copyright +++ b/debian/copyright @@ -8,7 +8,7 @@ License: Apache-2.0 Files: debian/* Copyright: (c) 2016, Filip Pytloun - (c) 2016, Ondřej Nový + (c) 2016, Ondřej Nový License: Apache-2.0 License: Apache-2.0 From d1b384669cb58fe221e891b6ed72c9127cfc1052 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Nov=C3=BD?= Date: Mon, 21 Nov 2016 15:57:40 +0100 Subject: [PATCH 11/14] Bumped debhelper version to 10 --- debian/changelog | 1 + debian/compat | 2 +- debian/control | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 407126d..ed3d6f0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ salt-formula-keystone (2016.4.1-4) UNRELEASED; urgency=medium * d/{control,copyright}: Use my @debian.org email address + * Bumped debhelper version to 10 -- Ondřej Nový Mon, 20 Jun 2016 20:15:04 +0200 diff --git a/debian/compat b/debian/compat index ec63514..f599e28 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -9 +10 diff --git a/debian/control b/debian/control index 19d03bf..6a8264c 100644 --- a/debian/control +++ b/debian/control @@ -4,7 +4,7 @@ Uploaders: Filip Pytloun , Ondřej Nový , Section: admin Priority: extra -Build-Depends: debhelper (>= 9), +Build-Depends: debhelper (>= 10), openstack-pkg-tools, Build-Depends-Indep: python-all, python-yaml, From 9a86b29baabcc14d7ca4ac14b1d1e44644797988 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Nov=C3=BD?= Date: Sun, 25 Dec 2016 17:06:38 +0100 Subject: [PATCH 12/14] New upstream release --- debian/changelog | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index ed3d6f0..edca3f3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,10 @@ -salt-formula-keystone (2016.4.1-4) UNRELEASED; urgency=medium +salt-formula-keystone (2016.12.1-1) unstable; urgency=medium + * New upstream release * d/{control,copyright}: Use my @debian.org email address * Bumped debhelper version to 10 - -- Ondřej Nový Mon, 20 Jun 2016 20:15:04 +0200 + -- Ondřej Nový Sun, 25 Dec 2016 17:05:55 +0100 salt-formula-keystone (2016.4.1-3) unstable; urgency=medium From ce6a45bab87c9b51ebb48cfb41545362f1fffce0 Mon Sep 17 00:00:00 2001 From: Petr Michalec Date: Wed, 8 Mar 2017 15:51:31 +0100 Subject: [PATCH 13/14] update dependencies --- debian/changelog | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/debian/changelog b/debian/changelog index edca3f3..a62d282 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,7 @@ +salt-formula-keystone (2016.12.1-2) unstable; urgency=medium + * Update CI + * Update dependencies + salt-formula-keystone (2016.12.1-1) unstable; urgency=medium * New upstream release From b4b3c8b101b891e329f18b84a4f334fdd80007b3 Mon Sep 17 00:00:00 2001 From: Petr Michalec Date: Wed, 8 Mar 2017 16:11:46 +0100 Subject: [PATCH 14/14] Update dependencies --- debian/control | 2 ++ metadata.yml | 6 ++++++ 2 files changed, 8 insertions(+) diff --git a/debian/control b/debian/control index 6a8264c..7f6370c 100644 --- a/debian/control +++ b/debian/control @@ -18,6 +18,8 @@ Package: salt-formula-keystone Architecture: all Depends: reclass, salt-master, + salt-formula-mysql, + salt-formula-apache, ${misc:Depends}, Description: Salt formula for OpenStack Keystone Salt is a powerful remote execution manager that can be used to diff --git a/metadata.yml b/metadata.yml index 1cafe29..70bdb58 100644 --- a/metadata.yml +++ b/metadata.yml @@ -1,3 +1,9 @@ name: "keystone" version: "2016.4.1" source: "https://github.com/openstack/salt-formula-keystone" +dependencies: +- name: apache + source: "https://github.com/salt-formulas/salt-formula-apache" +- name: mysql + source: "https://github.com/salt-formulas/salt-formula-mysql" +