Removed faros-config from monorepo structure (#1)

Faros Config now lives in a separate [repository](https://github.com/project-faros/faros-config) in order to enable it to have its own release cycle and separate, dedicated CI and testing.
project-faros · Jan 25, 2021 · 9724ac4 · 9724ac4
1 parent 43d3dbf
commit 9724ac4
Show file tree

Hide file tree

Showing 16 changed files with 7 additions and 228 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -15,10 +15,11 @@ COPY requirements.txt /deps/python_requirements.txt
 COPY requirements.yml /deps/ansible_requirements.yml
 COPY home /root
 COPY pre /pre
+
 RUN set -ex; \
     microdnf update; \
     microdnf install python3 jq openssh-clients tar sshpass findutils telnet less ncurses; \
-    pip3 install --user -r /deps/python_requirements.txt /pre/faros_config; \
+    pip3 install --user -r /deps/python_requirements.txt; \
     ansible-galaxy collection install -r /deps/ansible_requirements.yml; \
     microdnf clean all; \
     rpm -i /pre/ilorest-3.0.1-7.x86_64.rpm; \

diff --git a/app/inventory.py b/app/inventory.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python3
 import argparse
 from collections import defaultdict
-from faros_config import FarosConfig
+from faros_config import FarosConfig, PydanticEncoder
 import ipaddress
 import json
 import os
@@ -12,17 +12,6 @@
 IP_RESERVATIONS = '/data/ip_addresses'
 
 
-class PydanticEncoder(json.JSONEncoder):
-    def default(self, obj):
-        obj_has_dict = getattr(obj, "dict", False)
-        if obj_has_dict and callable(obj_has_dict):
-            return obj.dict(exclude_none=True)
-        elif isinstance(obj, ipaddress._IPAddressBase):
-            return str(obj)
-        else:
-            return json.JSONEncoder.default(self, obj)
-
-
 class InventoryGroup(object):
 
     def __init__(self, parent, name):

diff --git a/data.skel/config.yml b/data.skel/config.yml
@@ -4,6 +4,9 @@ network:
   lan:
     subnet: 192.168.8.0/24
     interfaces: []
+    dhcp:
+      ignore_macs: []
+      extra_reservations: []
 bastion:
   become_pass: admin
 cluster:

diff --git a/pre/faros_config/README.md b/pre/faros_config/README.md
diff --git a/pre/faros_config/VERSION.txt b/pre/faros_config/VERSION.txt
diff --git a/pre/faros_config/example_config.yml b/pre/faros_config/example_config.yml
diff --git a/pre/faros_config/faros_config/__init__.py b/pre/faros_config/faros_config/__init__.py
diff --git a/pre/faros_config/faros_config/bastion.py b/pre/faros_config/faros_config/bastion.py
diff --git a/pre/faros_config/faros_config/cluster.py b/pre/faros_config/faros_config/cluster.py
diff --git a/pre/faros_config/faros_config/common.py b/pre/faros_config/faros_config/common.py
diff --git a/pre/faros_config/faros_config/network.py b/pre/faros_config/faros_config/network.py
diff --git a/pre/faros_config/faros_config/proxy.py b/pre/faros_config/faros_config/proxy.py
diff --git a/pre/faros_config/setup.cfg b/pre/faros_config/setup.cfg
diff --git a/pre/faros_config/setup.py b/pre/faros_config/setup.py
diff --git a/pre/faros_config/test_config.py b/pre/faros_config/test_config.py
diff --git a/requirements.txt b/requirements.txt
@@ -1,4 +1,5 @@
 ansible<2.11
+faros-config==0.1.3
 
 # for management/ilo provider
 python-hpilo==4.4.3