BIND 10 trac3140, updated. dd33ad7952c96f69eebcc773576d01fcd21f4714 [3140] add .gitignore for copied config file

[BIND 10 source code commits]

The branch, trac3140 has been updated
       via  dd33ad7952c96f69eebcc773576d01fcd21f4714 (commit)
       via  cb314bbe37f09d755dea266f0fe832bd0cc89313 (commit)
      from  6473f037f0b8d67ca53faad4339ae596e433ec97 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit dd33ad7952c96f69eebcc773576d01fcd21f4714
Author: Jeremy C. Reed <jreed at isc.org>
Date:   Thu Oct 3 12:13:35 2013 -0500

    [3140] add .gitignore for copied config file
    
    as suggested in ticket feedback

commit cb314bbe37f09d755dea266f0fe832bd0cc89313
Author: Jeremy C. Reed <jreed at isc.org>
Date:   Thu Oct 3 12:11:02 2013 -0500

    [3140] have a template config file and set address init component name
    
    The config file was renamed.
    
    As suggested in ticket feedback.

-----------------------------------------------------------------------

Summary of changes:
 tests/lettuce/configurations/dhcp/.gitignore       |    1 +
 ...{dhcp4_basic.config => dhcp4_basic.config.orig} |    1 +
 tests/lettuce/features/terrain/terrain.py          |    2 ++
 3 files changed, 4 insertions(+)
 create mode 100644 tests/lettuce/configurations/dhcp/.gitignore
 rename tests/lettuce/configurations/dhcp/{dhcp4_basic.config => dhcp4_basic.config.orig} (92%)

-----------------------------------------------------------------------
diff --git a/tests/lettuce/configurations/dhcp/.gitignore b/tests/lettuce/configurations/dhcp/.gitignore
new file mode 100644
index 0000000..8361721
--- /dev/null
+++ b/tests/lettuce/configurations/dhcp/.gitignore
@@ -0,0 +1 @@
+/dhcp4_basic.config
diff --git a/tests/lettuce/configurations/dhcp/dhcp4_basic.config b/tests/lettuce/configurations/dhcp/dhcp4_basic.config
deleted file mode 100644
index 4765788..0000000
--- a/tests/lettuce/configurations/dhcp/dhcp4_basic.config
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-    "version": 3,
-    "Logging": {
-        "loggers": [ {
-            "severity": "DEBUG",
-            "name": "*",
-            "debuglevel": 99
-        } ]
-    },
-    "Dhcp4": {
-    },
-    "Init": {
-        "components": {
-            "b10-dhcp4": {
-                "kind": "needed"
-            },
-            "b10-cmdctl": {
-                "kind": "needed",
-                "special": "cmdctl"
-            }
-        }
-    }
-}
diff --git a/tests/lettuce/configurations/dhcp/dhcp4_basic.config.orig b/tests/lettuce/configurations/dhcp/dhcp4_basic.config.orig
new file mode 100644
index 0000000..9910d15
--- /dev/null
+++ b/tests/lettuce/configurations/dhcp/dhcp4_basic.config.orig
@@ -0,0 +1,24 @@
+{
+    "version": 3,
+    "Logging": {
+        "loggers": [ {
+            "severity": "DEBUG",
+            "name": "*",
+            "debuglevel": 99
+        } ]
+    },
+    "Dhcp4": {
+    },
+    "Init": {
+        "components": {
+            "b10-dhcp4": {
+                "address": "Dhcp4",
+                "kind": "needed"
+            },
+            "b10-cmdctl": {
+                "kind": "needed",
+                "special": "cmdctl"
+            }
+        }
+    }
+}
diff --git a/tests/lettuce/features/terrain/terrain.py b/tests/lettuce/features/terrain/terrain.py
index d0ba4fe..0985013 100644
--- a/tests/lettuce/features/terrain/terrain.py
+++ b/tests/lettuce/features/terrain/terrain.py
@@ -66,6 +66,8 @@ copylist = [
      "configurations/ddns/ddns.config"],
     ["configurations/ddns/noddns.config.orig",
      "configurations/ddns/noddns.config"],
+    ["configurations/dhcp/dhcp4_basic.config.orig",
+     "configurations/dhcp/dhcp4_basic.config"],
     ["configurations/xfrin/retransfer_master.conf.orig",
      "configurations/xfrin/retransfer_master.conf"],
     ["configurations/xfrin/retransfer_master_v4.conf.orig",