From 6fd6de8aff72fc9a8a0bb7f4619304966969f49c Mon Sep 17 00:00:00 2001
From: thomashaw <thomashaw@gmail.com>
Date: Tue, 19 Jul 2016 15:01:51 +0100
Subject: [PATCH] Firewall merge small changes to demonstrate scenario creation
 pre-dependencies.

---
 modules/services/unix/firewall/firewall/firewall.pp        | 7 -------
 .../services/unix/firewall/firewall/secgen_metadata.xml    | 3 ---
 .../simple_examples/firewall_configuration_example.xml     | 6 ++++--
 3 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/modules/services/unix/firewall/firewall/firewall.pp b/modules/services/unix/firewall/firewall/firewall.pp
index 797bb0b49..98d987641 100644
--- a/modules/services/unix/firewall/firewall/firewall.pp
+++ b/modules/services/unix/firewall/firewall/firewall.pp
@@ -1,10 +1,3 @@
-######################################################
-##### Update - REMOVED WHEN DEPENDENCY CODE DONE #####
-######################################################
-exec { 'update':
-  command => '/usr/bin/apt-get update',
-}
-
 ######################################################
 ##### Purge all existing firewall rules (if any) #####
 ######################################################
diff --git a/modules/services/unix/firewall/firewall/secgen_metadata.xml b/modules/services/unix/firewall/firewall/secgen_metadata.xml
index ec489b3ab..48ecf5afa 100644
--- a/modules/services/unix/firewall/firewall/secgen_metadata.xml
+++ b/modules/services/unix/firewall/firewall/secgen_metadata.xml
@@ -25,9 +25,6 @@
   <software_license>Apache v2</software_license>
 
   <!--Cannot co-exist with other iptables installations-->
-  <conflict>
-    <software_name></software_name>
-  </conflict>
 
 </service>
 
diff --git a/scenarios/simple_examples/firewall_configuration_example.xml b/scenarios/simple_examples/firewall_configuration_example.xml
index 56e6542f9..7365ad49a 100644
--- a/scenarios/simple_examples/firewall_configuration_example.xml
+++ b/scenarios/simple_examples/firewall_configuration_example.xml
@@ -9,8 +9,10 @@
     <system_name>firewall_configuration_example</system_name>
     <base platform="linux"/>
 
-    <!--<service module_path="modules/services/unix/update/unix_update"></service>-->
-    <!--<service module_path="modules/services/unix/firewall/iptables_config"></service>-->
+    <!--TODO: Dependency-->
+    <service module_path="modules/services/unix/update/unix_update"></service>
+    <!--TODO: /Dependency-->
+
     <service module_path="modules/services/unix/firewall/firewall"></service>
 
     <network type="private_network" range="dhcp"></network>