From e1beb211bd8ea8f1d6585ffc49f0979a66dad640 Mon Sep 17 00:00:00 2001
From: Harry Sutton <harry.sutton@hp.com>
Date: Mon, 8 Jun 2015 11:53:56 -0400
Subject: [PATCH] Instructions to resolve an openSUSE 13.2 dependency conflict

Adds a note with instructions to respond to a pattern dependency
conflict when a minimal server install is used.

Modified: replaced the note with a simpler instruction to remove
the offending package in the Basic Environment section of the
Install Guide.

Change-Id: I2ad6c8cf7ce76fa42950e51f267224cd8142199c
Closes-bug: #1462624
Backport: Kilo
---
 doc/install-guide/section_basics-packages.xml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/doc/install-guide/section_basics-packages.xml b/doc/install-guide/section_basics-packages.xml
index 2596f6144b..812001f632 100644
--- a/doc/install-guide/section_basics-packages.xml
+++ b/doc/install-guide/section_basics-packages.xml
@@ -58,6 +58,11 @@
         or SLES version:</para>
       <para>On openSUSE 13.2:</para>
       <screen><prompt>#</prompt> <userinput>zypper addrepo -f obs://Cloud:OpenStack:Kilo/openSUSE_13.2 Kilo</userinput></screen>
+      <para>The openSUSE distribution uses the concept of patterns to represent
+        collections of packages. If you selected 'Minimal Server Selection (Text Mode)'
+        during initial installation, you may be presented with a dependency conflict when you
+        attempt to install the OpenStack packages. To avoid this, remove the minimal_base-conflicts package:</para>
+      <screen><prompt>#</prompt> <userinput>zypper rm patterns-openSUSE-minimal_base-conflicts</userinput></screen>
       <para>On SLES 12:</para>
       <screen><prompt>#</prompt> <userinput>zypper addrepo -f obs://Cloud:OpenStack:Kilo/SLE_12 Kilo</userinput></screen>
       <note>