apevec pushed to openstack-packstack (master). "Add ability to enable rdo testing repo (..more)"

[notifications at fedoraproject.org]

From 458425a9945135adbefee3ba02efee980dfc1adc Mon Sep 17 00:00:00 2001
From: Alan Pevec <alan.pevec at redhat.com>
Date: Wed, 3 Jun 2015 02:46:45 +0200
Subject: Add ability to enable rdo testing repo

CONFIG_ENABLE_RDO_TESTING
   Specify 'y' to enable the RDO testing repository.

rhbz#1218750

Change-Id: Ia149c101e1860cbd7f60521efe6ae081b2d6419e

diff --git a/0003-Add-ability-to-enable-rdo-testing-repo.patch b/0003-Add-ability-to-enable-rdo-testing-repo.patch
new file mode 100644
index 0000000..b45c001
--- /dev/null
+++ b/0003-Add-ability-to-enable-rdo-testing-repo.patch
@@ -0,0 +1,65 @@
+From 5359440ac6e03f62c6fe315e58474a0c28e4f055 Mon Sep 17 00:00:00 2001
+From: Ivan Chavero <ichavero at redhat.com>
+Date: Thu, 14 May 2015 17:15:12 -0600
+Subject: [PATCH] Add ability to enable rdo testing repo
+
+The new rdo-release-kilo now adds the testing repo this patch
+allows the user to enable the repo.
+
+Change-Id: I2de49561ca287df42e084e3d6c70183f7a1e21f9
+---
+ docs/packstack.rst                 |  3 +++
+ packstack/plugins/prescript_000.py | 19 ++++++++++++++++++-
+ 2 files changed, 21 insertions(+), 1 deletion(-)
+
+diff --git a/docs/packstack.rst b/docs/packstack.rst
+index 9060016..cdefb70 100644
+--- a/docs/packstack.rst
++++ b/docs/packstack.rst
+@@ -134,6 +134,9 @@
+ **CONFIG_REPO**
+     Comma-separated list of URLs for any additional yum repositories, to use for installation.
+ 
++**CONFIG_ENABLE_RDO_TESTING**
++   Specify 'y' to enable the RDO testing repository. ['y', 'n']
++
+ RHEL config
+ -----------
+ 
+diff --git a/packstack/plugins/prescript_000.py b/packstack/plugins/prescript_000.py
+index 62d8fa2..ee4aa38 100644
+--- a/packstack/plugins/prescript_000.py
++++ b/packstack/plugins/prescript_000.py
+@@ -539,7 +539,19 @@
+              "CONF_NAME": "CONFIG_REPO",
+              "USE_DEFAULT": False,
+              "NEED_CONFIRM": False,
+-             "CONDITION": False}
++             "CONDITION": False},
++
++            {"CMD_OPTION": "enable-rdo-testing",
++             "PROMPT": "To enable rdo testing enter \"y\"",
++             "OPTION_LIST": ["y", "n"],
++             "VALIDATORS": [validators.validate_options],
++             "DEFAULT_VALUE": "n",
++             "MASK_INPUT": False,
++             "LOOSE_VALIDATION": True,
++             "CONF_NAME": "CONFIG_ENABLE_RDO_TESTING",
++             "USE_DEFAULT": False,
++             "NEED_CONFIRM": False,
++             "CONDITION": False},
+         ],
+ 
+         "RHEL": [
+@@ -1105,6 +1117,11 @@
+     reponame = 'openstack-%s' % version
+     server.clear()
+     server.append('yum-config-manager --enable %(reponame)s' % locals())
++
++    if config['CONFIG_ENABLE_RDO_TESTING'] == 'y':
++        server.append('yum-config-manager --disable %(reponame)s' % locals())
++        server.append('yum-config-manager --enable %(reponame)s-testing' % locals())
++
+     # yum-config-manager returns 0 always, but returns current setup
+     # if succeeds
+     rc, out = server.execute()
diff --git a/openstack-packstack.spec b/openstack-packstack.spec
index 8f62967..4339f72 100644
--- a/openstack-packstack.spec
+++ b/openstack-packstack.spec
@@ -8,7 +8,7 @@
 
 Name:           openstack-packstack
 Version:        2015.1
-Release:        0.3.dev%{git_snaptag}.%{git_commit}%{?dist}
+Release:        0.4.dev%{git_snaptag}.%{git_commit}%{?dist}
 Summary:        Openstack Install Utility
 
 Group:          Applications/System
@@ -19,6 +19,7 @@ Source0:        http://mmagr.fedorapeople.org/downloads/packstack/packstack-%{up
 
 Patch1:         0001-Fix-mongodb-configuration.patch
 Patch2:         0002-Do-not-enable-Keystone-in-httpd-by-default.patch
+Patch3:         0003-Add-ability-to-enable-rdo-testing-repo.patch
 
 BuildArch:      noarch
 
@@ -74,6 +75,7 @@ This package contains documentation files for Packstack.
 %setup -q -n packstack-%{upstream_version}
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 # Sanitizing a lot of the files in the puppet modules
 find packstack/puppet/modules \( -name .fixtures.yml -o -name .gemfile -o -name ".travis.yml" -o -name .rspec \) -exec rm {} +
@@ -152,6 +154,9 @@ rm -fr %{buildroot}%{python_sitelib}/docs
 # changelog --------------------------------------------------------------------
 
 %changelog
+* Wed Jun 03 2015 Alan Pevec <apevec at redhat.com> - 2015.1-0.4.dev1537.gba5183c
+- Add ability to enable rdo testing repo - rhbz#1218750
+
 * Tue Jun 02 2015 Alan Pevec <apevec at redhat.com> - 2015.1-0.3.dev1537.gba5183c
 - Do not enable Keystone in httpd by default
 
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/openstack-packstack.git/commit/?h=master&id=458425a9945135adbefee3ba02efee980dfc1adc