From 5d0b9a5635aee3a579a6b64688e3f00f6a020e22 Mon Sep 17 00:00:00 2001
From: Dmitry Pyzhov <dpyzhov@mirantis.com>
Date: Fri, 31 May 2013 13:43:41 +0400
Subject: [PATCH] Grizzly

---
 config.mk                  |  2 +-
 fuel                       |  2 +-
 mirror/centos/yum_repos.mk | 16 +++++-----------
 requirements-rpm.txt       | 32 ++++++++++++++++----------------
 4 files changed, 23 insertions(+), 29 deletions(-)

diff --git a/config.mk b/config.mk
index 765a9cd07b..cbc649ad43 100644
--- a/config.mk
+++ b/config.mk
@@ -83,7 +83,7 @@ REQUIRED_SRCS:=$(shell grep -v ^\\s*\# $(SOURCE_DIR)/requirements-src.txt)
 # The actual name will be constracted wich prepending "yum_repo_" prefix.
 # Example: YUM_REPOS?=official epel => yum_repo_official and yum_repo_epel
 # will be used.
-YUM_REPOS?=official fuel_folsom_2_1 puppetlabs
+YUM_REPOS?=official fuel
 
 # Mirror of source packages. Bareword 'internet' is used to download packages
 # directly from the internet
diff --git a/fuel b/fuel
index cc0af95885..dc32af83f2 160000
--- a/fuel
+++ b/fuel
@@ -1 +1 @@
-Subproject commit cc0af9588552362565dcb64eb7e0a75b2bc0c6ec
+Subproject commit dc32af83f243dee4401cf2230f1416925f89b43c
diff --git a/mirror/centos/yum_repos.mk b/mirror/centos/yum_repos.mk
index 251592fda5..d46c69ce58 100644
--- a/mirror/centos/yum_repos.mk
+++ b/mirror/centos/yum_repos.mk
@@ -66,18 +66,12 @@ enabled=1
 priority=20
 endef
 
-define yum_repo_fuel_folsom_2_1
-[openstack-epel-fuel-2.1]
+define yum_repo_fuel
+[epel-fuel-grizzly]
 name=Mirantis OpenStack Custom Packages
-#mirrorlist=http://download.mirantis.com/epel-fuel-folsom-2.1/mirror.internal.list
-baseurl=http://srv08-srt.srt.mirantis.net/centos-repo/epel-fuel-folsom-2.1/
-gpgkey=https://fedoraproject.org/static/0608B895.txt
-  http://download.mirantis.com/epel-fuel-folsom-2.1/centos.key
-  http://download.mirantis.com/epel-fuel-folsom-2.1/epel.key
-  http://download.mirantis.com/epel-fuel-folsom-2.1/mirantis.key
-  http://download.mirantis.com/epel-fuel-folsom-2.1/mysql.key
-  http://download.mirantis.com/epel-fuel-folsom-2.1/rabbit.key
-gpgcheck=1
+#mirrorlist=http://download.mirantis.com/epel-fuel-grizzly/mirror.internal.list
+baseurl=http://srv08-srt.srt.mirantis.net/centos-repo/epel-fuel-grizzly/
+gpgcheck=0
 enabled=1
 priority=1
 endef
diff --git a/requirements-rpm.txt b/requirements-rpm.txt
index 97c6786ec6..dafcf65fce 100644
--- a/requirements-rpm.txt
+++ b/requirements-rpm.txt
@@ -46,17 +46,17 @@ openssh-clients-5.3p1-84.1.el6
 openssh-server-5.3p1-84.1.el6
 openssl-devel-1.0.0-27.el6_4.2
 openssl098e-0.9.8e-17.el6.centos.2
-openstack-cinder-2012.2.3.fuel2.0-mira.9
-openstack-dashboard-2012.2.3.fuel2.0-mira.4
-openstack-glance-2012.2.3.fuel2.0-mira.5
-openstack-keystone-2012.2.3.fuel2.0-mira.5
-openstack-nova-2012.2.3.fuel2.0.1.g427fca8-mira.2
+openstack-cinder-2013.1.0.1-mira.3
+openstack-dashboard-2013.1.0.1-mira.3
+openstack-glance-2013.1.0.1-mira.2
+openstack-keystone-2013.1.0.1-mira.2
+openstack-nova-2013.1.0.1.1.g1ad6e38-mira.2
 openstack-nova-novncproxy-0.4-8.el6
-openstack-swift-1.7.4.fuel2.0-mira.7
-openstack-swift-account-1.7.4.fuel2.0-mira.7
-openstack-swift-container-1.7.4.fuel2.0-mira.7
-openstack-swift-object-1.7.4.fuel2.0-mira.7
-openstack-swift-proxy-1.7.4.fuel2.0-mira.7
+openstack-swift-1.8.0-mira.3
+openstack-swift-account-1.8.0-mira.3
+openstack-swift-container-1.8.0-mira.3
+openstack-swift-object-1.8.0-mira.3
+openstack-swift-proxy-1.8.0-mira.3
 openstack-utils-2013.1-1.el6
 pacemaker-1.1.8-7.el6
 patch-2.6-6.el6
@@ -67,14 +67,14 @@ postgresql-libs-8.4.13-1.el6_3
 postgresql-server-8.4.13-1.el6_3
 puppet-2.7.19-1.el6
 puppet-server-2.7.19-1.el6
-puppetdb-1.0.5-1.el6
-puppetdb-terminus-1.0.5-1.el6
+puppetdb-1.2.0-1.el6
+puppetdb-terminus-1.2.0-1.el6
 python-amqp-1.2.0-6.el6
 python-argparse-1.2.1-2.el6
-python-cinder-2012.2.3.fuel2.0-mira.9
+python-cinder-2013.1.0.1-mira.3
 python-devel-2.6.6-36.el6
-python-keystone-2012.2.3.fuel2.0-mira.5
-python-novaclient-2.10.0.fuel2.0-mira.6
+python-keystone-2013.1.0.1-mira.2
+python-novaclient-2.13.0-mira.2
 python-pip-0.8-1.el6
 python-setuptools-0.6.10-3.el6
 python-virtualenv-1.7.2-1.el6
@@ -98,7 +98,7 @@ scapy-2.0.0.10-5.el6
 screen-4.0.3-16.el6
 selinux-policy-targeted-3.7.19-195.el6_4.3
 socat-1.7.2.1-1.el6
-supervisor-3.0a12-0.12.el6
+supervisor-3.0a12-0.11.el6
 syslinux-4.02-8.el6
 system-config-firewall-base-1.2.27-5.el6
 tcpdump-4.0.0-3.20090921gitdf3cb4.2.el6