Issues 147

For a full description please read here
eclipse-bluechi#147.
For each of the node types [hirte, agent] hirte
will get the default config from the default
files located in /usr/shar/hirte/{hirte|agent}
into the hashmap and only after that it will
get the custome config that the usr changed

Signed-off-by: Artiom Divak <adivak@redhat.com>

config/meson.build

@@ -9,3 +9,15 @@ install_data(
   'agent/agent.conf',
   install_dir :  get_option('sysconfdir') / 'hirte'
 )
+
+install_data(
+  'agent/hirte-default.conf',
+  install_dir : '/usr/share/hirte/agent'
+)
+
+install_data(
+  'hirte/hirte-default.conf',
+  install_dir : '/usr/share/hirte/hirte'
+)
+
+

src/agent/agent.c

@@ -404,7 +404,7 @@ bool agent_parse_config(Agent *agent, const char *configfile) {
 
         result = cfg_load_complete_configuration(
                         agent->config,
-                        NULL, // TODO: https://github.com/containers/hirte/issues/147
+                        CFG_USR_DEF_AGENT_CONF,
                         CFG_ETC_HIRTE_AGENT_CONF,
                         NULL); // TODO: https://github.com/containers/hirte/issues/148
         if (result != 0) {

src/libhirte/common/config.h

@@ -39,6 +39,8 @@ typedef struct config config;
 
 /* Standard configuration file locations
  */
+#define CFG_USR_DEF_AGENT_CONF "/usr/share/hirte/config/agent/hirte-default.conf"
+#define CFG_USR_DEF_HIRTE_CONF "/usr/share/hirte/config/hirte/hirte-default.conf"
 #define CFG_ETC_HIRTE_CONF "/etc/hirte/hirte.conf"
 #define CFG_ETC_HIRTE_AGENT_CONF "/etc/hirte/agent.conf"
 

src/manager/manager.c

@@ -278,7 +278,7 @@ bool manager_parse_config(Manager *manager, const char *configfile) {
 
         result = cfg_load_complete_configuration(
                         manager->config,
-                        NULL, // TODO: https://github.com/containers/hirte/issues/147
+                        CFG_USR_DEF_HIRTE_CONF,
                         CFG_ETC_HIRTE_CONF,
                         NULL); // TODO: https://github.com/containers/hirte/issues/148
         if (result != 0) {