From a2bc04a7c27c3a28d1fd3e0ff0c3b960c641f367 Mon Sep 17 00:00:00 2001
From: Javier Pena <jpena@redhat.com>
Date: Tue, 15 Dec 2015 17:42:32 +0100
Subject: [PATCH] Set proper OPM branch

With the recent OPM branch change, master-patches is now master
(upstream-master is the previous master). Packstack needs to adapt
to this.

Change-Id: Ib53a118e88542a88767a1c1cb61faafad54dd9b5
---
 setup.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup.py b/setup.py
index 33def63a9..7ebc73aa8 100644
--- a/setup.py
+++ b/setup.py
@@ -28,7 +28,7 @@ MODULES_DIR = os.environ.get('PACKSTACK_PUPPETDIR',
                              '/usr/share/openstack-puppet/modules')
 MODULES_REPO = ('https://github.com/redhat-openstack/'
                 'openstack-puppet-modules.git')
-MODULES_BRANCH = 'master-patches'
+MODULES_BRANCH = 'master'
 
 
 class InstallModulesCommand(Command):