From 831acd16c65747ddd8c7ca63e276f078c169dfc1 Mon Sep 17 00:00:00 2001
From: Daniel Heule <hda@sfs.biz>
Date: Mon, 14 Apr 2014 19:14:29 +0200
Subject: [PATCH] rename parameter repo_uri to uri as requested by nico

---
 cdist/conf/type/__zypper_repo/explorer/repo_id   |  6 +++---
 cdist/conf/type/__zypper_repo/gencode-remote     |  6 +++---
 cdist/conf/type/__zypper_repo/man.text           | 12 ++++++------
 cdist/conf/type/__zypper_repo/parameter/optional |  2 +-
 4 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/cdist/conf/type/__zypper_repo/explorer/repo_id b/cdist/conf/type/__zypper_repo/explorer/repo_id
index 83a698b7..be0b9771 100644
--- a/cdist/conf/type/__zypper_repo/explorer/repo_id
+++ b/cdist/conf/type/__zypper_repo/explorer/repo_id
@@ -18,11 +18,11 @@
 # along with cdist. If not, see <http://www.gnu.org/licenses/>.
 #
 #
-# Retrieve the id from the repo with the uri from parameter repo_uri  - parsed zypper output
+# Retrieve the id from the repo with the uri from parameter uri  - parsed zypper output
 #
 #
-if [ -f "$__object/parameter/repo_uri" ]; then
-   uri="$(cat "$__object/parameter/repo_uri")"
+if [ -f "$__object/parameter/uri" ]; then
+   uri="$(cat "$__object/parameter/uri")"
 else
    uri="$__object_id"
 fi
diff --git a/cdist/conf/type/__zypper_repo/gencode-remote b/cdist/conf/type/__zypper_repo/gencode-remote
index f678552b..005166c9 100644
--- a/cdist/conf/type/__zypper_repo/gencode-remote
+++ b/cdist/conf/type/__zypper_repo/gencode-remote
@@ -33,8 +33,8 @@ else
    desc="$__object_id"
 fi
 
-if [ -f "$__object/parameter/repo_uri" ]; then
-   uri="$(cat "$__object/parameter/repo_uri")"
+if [ -f "$__object/parameter/uri" ]; then
+   uri="$(cat "$__object/parameter/uri")"
 else
    uri="$__object_id"
 fi
@@ -65,7 +65,7 @@ fi
 case "$state" in
    present)
          if [ -z "$desc" ] || [ -z "$uri" ]; then
-             echo "parameter repo_desc and repo_uri for $state needed" >&2
+             echo "parameter repo_desc and uri for $state needed" >&2
              exit 4
          fi
          if [ -z "$repo_id" ]; then
diff --git a/cdist/conf/type/__zypper_repo/man.text b/cdist/conf/type/__zypper_repo/man.text
index 6ea88f16..e8024ce5 100644
--- a/cdist/conf/type/__zypper_repo/man.text
+++ b/cdist/conf/type/__zypper_repo/man.text
@@ -22,13 +22,13 @@ OPTIONAL PARAMETERS
 -------------------
 state::
     Either "present" or "absent" or "enabled" or "disabled", defaults to "present" + 
-    #present#  - make sure that the repo is aviable, needs repo_uri and repo_desc + 
-         for all following states, the repo can be searched via repo_id or repo_uri + 
+    #present#  - make sure that the repo is aviable, needs uri and repo_desc + 
+         for all following states, the repo can be searched via repo_id or uri + 
     #absent#   - drop the repo if found + 
     #enabled#  - a repo can have state disabled if installed via zypper service (ris), in this case, you can enable the repo + 
     #disabled# - instead of absent (drop), a repo can also set to disabled, wich makes it inaccessible + 
 
-repo_uri::
+uri::
     If supplied, use the uri and not the object id as repo uri.
 
 repo_desc::
@@ -43,10 +43,10 @@ EXAMPLES
 
 --------------------------------------------------------------------------------
 # Ensure testrepo in installed
-__zypper_repo testrepo --state present --repo_uri http://url.to.your.repo/with/path
+__zypper_repo testrepo --state present --uri http://url.to.your.repo/with/path
 
 # Drop repo by repo uri
-__zypper_repo testrepo --state absent --repo_uri http://url.to.your.repo/with/path
+__zypper_repo testrepo --state absent --uri http://url.to.your.repo/with/path
 
 # Drop repo by id number (attention: repos are always numbered from 1 to max)
 __zypper_repo testrepo --state absent --repo_id 1
@@ -55,7 +55,7 @@ __zypper_repo testrepo --state absent --repo_id 1
 __zypper_repo testrepo2 --state enabled --repo_id 2
 
 # enable repo by uri
-__zypper_repo testrepo3 --state enabled --repo_uri http://url.to.your.repo/with/path
+__zypper_repo testrepo3 --state enabled --uri http://url.to.your.repo/with/path
 
 # disable a repo works like enabling it
 __zypper_repo testrepo4 --state disabled --repo_id 4
diff --git a/cdist/conf/type/__zypper_repo/parameter/optional b/cdist/conf/type/__zypper_repo/parameter/optional
index 6f5a8325..fe40e350 100644
--- a/cdist/conf/type/__zypper_repo/parameter/optional
+++ b/cdist/conf/type/__zypper_repo/parameter/optional
@@ -1,4 +1,4 @@
 state
-repo_uri
+uri
 repo_desc
 repo_id