From 2de32bc87019fc52a081373b77789518c9bbb297 Mon Sep 17 00:00:00 2001
From: Michael Reuter <mareuternh@gmail.com>
Date: Wed, 6 Feb 2019 11:15:17 -0700
Subject: [PATCH 1/4] Updating configuration for header service.

---
 puppet-master/hiera/dev/vm/dm/vm/hs/hs.yaml | 4 +++-
 puppet-master/hiera/dev/vm/vm.yaml          | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/puppet-master/hiera/dev/vm/dm/vm/hs/hs.yaml b/puppet-master/hiera/dev/vm/dm/vm/hs/hs.yaml
index f9b8da0..8c409d2 100644
--- a/puppet-master/hiera/dev/vm/dm/vm/hs/hs.yaml
+++ b/puppet-master/hiera/dev/vm/dm/vm/hs/hs.yaml
@@ -12,7 +12,9 @@ dm::dm_header_service::ts_xml_languages:
         - "cpp"
         - "python"
 
-ts_sal::sal_network_interface: "eth1"
+#TODO Testing variables, to be removed???
+
+ts_sal::sal_network_interface: "eth0"
 
 monitoring_enabled: false
 
diff --git a/puppet-master/hiera/dev/vm/vm.yaml b/puppet-master/hiera/dev/vm/vm.yaml
index e17e286..06207f2 100644
--- a/puppet-master/hiera/dev/vm/vm.yaml
+++ b/puppet-master/hiera/dev/vm/vm.yaml
@@ -37,4 +37,4 @@ ts_sal::sal_pwd: "$1$LSST$HYme564rL6LjMkjrDNGUb0"
 ts_sal::salmgr_pwd: "$1$LSST$HYme564rL6LjMkjrDNGUb0"
 
 #Make sure SAL uses the desired network interface
-ts_sal::sal_network_interface: "eth1"
\ No newline at end of file
+ts_sal::sal_network_interface: "eth1"

From 03aa779dbce6a1a6c18c1f9c124dd3eb95314dfd Mon Sep 17 00:00:00 2001
From: Michael Reuter <mareuternh@gmail.com>
Date: Fri, 15 Mar 2019 11:54:49 -0700
Subject: [PATCH 2/4] Adding back the branch to the puppet environment.

---
 puppet-master/Puppetconf.yaml | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/puppet-master/Puppetconf.yaml b/puppet-master/Puppetconf.yaml
index 725a511..f7ec5e7 100644
--- a/puppet-master/Puppetconf.yaml
+++ b/puppet-master/Puppetconf.yaml
@@ -10,7 +10,14 @@ puppet-master:
         memory: 1024
         cpu: 1
         # gitcode_path will be mounted on this environment in: /etc/puppetlabs/code/environments/$ENVIRONMENT
+<<<<<<< HEAD
         #puppet_environment: "production"
         # If you want to work on your own puppet code, we recommend adding this variable with the path in where the puppet code is
         #gitcode_path: "../../itconf_l1ts/"  
- 
\ No newline at end of file
+ 
+=======
+        puppet_environment: "IT_992_mareuter"
+        # If you want to work on your own puppet code, we recommend adding this variable with the path in where the puppet code is
+        gitcode_path: "../../itconf_l1ts/"  
+ 
+>>>>>>> Adding back the branch to the puppet environment.

From 79af7c6e4293b7e56864f08bca709bed82881b67 Mon Sep 17 00:00:00 2001
From: Michael Reuter <mareuternh@gmail.com>
Date: Mon, 18 Mar 2019 17:15:18 -0700
Subject: [PATCH 3/4] Switch back to eth1 interface.

---
 puppet-master/hiera/dev/vm/dm/vm/hs/hs.yaml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/puppet-master/hiera/dev/vm/dm/vm/hs/hs.yaml b/puppet-master/hiera/dev/vm/dm/vm/hs/hs.yaml
index 8c409d2..329295c 100644
--- a/puppet-master/hiera/dev/vm/dm/vm/hs/hs.yaml
+++ b/puppet-master/hiera/dev/vm/dm/vm/hs/hs.yaml
@@ -12,10 +12,6 @@ dm::dm_header_service::ts_xml_languages:
         - "cpp"
         - "python"
 
-#TODO Testing variables, to be removed???
-
-ts_sal::sal_network_interface: "eth0"
-
 monitoring_enabled: false
 
 firewalld_status: "stopped"

From ec85b4ea7c2415b13e60a4a0981d87e3c33caff5 Mon Sep 17 00:00:00 2001
From: Michael Reuter <mareuternh@gmail.com>
Date: Tue, 26 Mar 2019 18:52:08 -0700
Subject: [PATCH 4/4] Fixing puppet-master Puppetconf file.

---
 puppet-master/Puppetconf.yaml | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/puppet-master/Puppetconf.yaml b/puppet-master/Puppetconf.yaml
index f7ec5e7..59df796 100644
--- a/puppet-master/Puppetconf.yaml
+++ b/puppet-master/Puppetconf.yaml
@@ -10,14 +10,6 @@ puppet-master:
         memory: 1024
         cpu: 1
         # gitcode_path will be mounted on this environment in: /etc/puppetlabs/code/environments/$ENVIRONMENT
-<<<<<<< HEAD
-        #puppet_environment: "production"
-        # If you want to work on your own puppet code, we recommend adding this variable with the path in where the puppet code is
-        #gitcode_path: "../../itconf_l1ts/"  
- 
-=======
         puppet_environment: "IT_992_mareuter"
         # If you want to work on your own puppet code, we recommend adding this variable with the path in where the puppet code is
         gitcode_path: "../../itconf_l1ts/"  
- 
->>>>>>> Adding back the branch to the puppet environment.