From b00bce2d2f6f7c8e56b2f127b0f40ce8f190f942 Mon Sep 17 00:00:00 2001
From: Jonas Forsberg <jonas.forsberg@suse.com>
Date: Sat, 6 Nov 2021 11:49:10 +0100
Subject: [PATCH] .

---
 doc/admin-server.md      | 83 ----------------------------------------
 doc/salt-states.md       | 77 +++++++++++++++++++++++++++++++++++++
 salt/states/pxe/init.sls |  1 +
 3 files changed, 78 insertions(+), 83 deletions(-)
 create mode 100644 doc/salt-states.md

diff --git a/doc/admin-server.md b/doc/admin-server.md
index b37e491..7fb0801 100644
--- a/doc/admin-server.md
+++ b/doc/admin-server.md
@@ -52,86 +52,3 @@ If you make changes in your `salt/pillars/local.sls` you can run the following t
 ```
 ./update.sh --salt
 ```
-
-## Components - Salt States
-[chrony](#chrony)
-[dnsmasq](#dnsmasq)
-[docker](#docker)
-[firewalld](#firewalld)
-[hostapd](#hostapd)
-[hosts](#hosts)
-[mariadb](#mariadb)
-[nfs-server](#nfs-server)
-[nginx](#nginx)
-[packages](#packages)
-[podman](#podman)
-[pxe](#pxe)
-[rancher](#rancher)
-[remote-desktop](#remote-desktop)
-[rmt](#rmt)
-[ssh](#ssh)
-[tlu-harvester](#tlu-harvester)
-[vlan](#vlan)
-[wol](#wol)
-
-<a name="chrony"/>
-### chrony
-Chrony is an implementation of the Network Time Protocol (NTP).
-This step will install chrony and configure upstream pools and start serving NTP on internal networks
-```
-# salt/pillars/chrony.sls
-chrony:
-  pool:
-    - 0.se.pool.ntp.org
-    - 1.se.pool.ntp.org
-    - 2.se.pool.ntp.org
-    - 3.se.pool.ntp.org
-```
-<a name="dnsmasq"/>
-### dnsmasq
-Serves dhcp and dns for internal network
-This step will install dnsmasq and configure dhcp for all internal networks defined in `salt/pillars/network.sls`
-It will also configure the pxe next step, etc.
-
-<a name="docker"/>
-### docker
-This step will create podman container running a local docker registry pull through instance, also a systemd service called `registry-container.service` is created.
-```
-# salt/pillars/docker.sls
-docker:
-  username:
-  access_token:
-  url: docker.io/registry
-  tag: 2.7.1
-```
-
-<a name="firewalld"/>
-### firewalld
-Configures firewalld services and networks
-
-<a name="hostapd"/>
-Installs and configures hostapd to use the wireless interface as a access point
-```
-# salt/pillars/hostapd.sls
-hostapd:
-  country_code: SE
-  ssid: Transportable Lab Unit
-  channel: 6
-  wpa_passphrase: linux2linux
-```
-
-<a name="hosts"/>
-### hosts
-Configures the hostname and `/etc/hosts`file so [dnsmasq](#dnsmask) has correct information
-
-<a name="mariadb"/>
-### mariadb
-Installs and configures mariadb, [rmt](#rmt) needs a database
-```
-# salt/pillars/mysql.sls
-mysql:
-  root_password: linux
-```
-
-<a href="nfs-server"/>
-### nfs-server
diff --git a/doc/salt-states.md b/doc/salt-states.md
new file mode 100644
index 0000000..b84a2b6
--- /dev/null
+++ b/doc/salt-states.md
@@ -0,0 +1,77 @@
+# Components - Salt States
+ - [chrony](#chrony)
+ - [dnsmasq](#dnsmasq)
+ - [docker](#docker)
+ - [firewalld](#firewalld)
+ - [hostapd](#hostapd)
+ - [hosts](#hosts)
+ - [mariadb](#mariadb)
+ - [nfs-server](#nfs-server)
+ - [nginx](#nginx)
+ - [packages](#packages)
+ - [podman](#podman)
+ - [pxe](#pxe)
+ - [rancher](#rancher)
+ - [remote-desktop](#remote-desktop)
+ - [rmt](#rmt)
+ - [ssh](#ssh)
+ - [tlu-harvester](#tlu-harvester)
+ - [vlan](#vlan)
+ - [wol](#wol)
+
+## chrony
+Chrony is an implementation of the Network Time Protocol (NTP).
+This step will install chrony and configure upstream pools and start serving NTP on internal networks
+```
+# salt/pillars/chrony.sls
+chrony:
+  pool:
+    - 0.se.pool.ntp.org
+    - 1.se.pool.ntp.org
+    - 2.se.pool.ntp.org
+    - 3.se.pool.ntp.org
+```
+
+## dnsmasq
+Serves dhcp and dns for internal network
+This step will install dnsmasq and configure dhcp for all internal networks defined in `salt/pillars/network.sls`
+It will also configure the pxe next step, etc.
+
+## docker
+This step will create podman container running a local docker registry pull through instance, also a systemd service called `registry-container.service` is created.
+```
+# salt/pillars/docker.sls
+docker:
+  username:
+  access_token:
+  url: docker.io/registry
+  tag: 2.7.1
+```
+
+## firewalld
+Configures firewalld services and networks
+
+<a name="hostapd"/>
+Installs and configures hostapd to use the wireless interface as a access point
+```
+# salt/pillars/hostapd.sls
+hostapd:
+  country_code: SE
+  ssid: Transportable Lab Unit
+  channel: 6
+  wpa_passphrase: linux2linux
+```
+
+## hosts
+Configures the hostname and `/etc/hosts`file so [dnsmasq](#dnsmask) has correct information
+
+<a name="mariadb"/>
+### mariadb
+Installs and configures mariadb, [rmt](#rmt) needs a database
+```
+# salt/pillars/mysql.sls
+mysql:
+  root_password: linux
+```
+
+## nfs-server
diff --git a/salt/states/pxe/init.sls b/salt/states/pxe/init.sls
index da035b6..c41b82a 100644
--- a/salt/states/pxe/init.sls
+++ b/salt/states/pxe/init.sls
@@ -1,3 +1,4 @@
 include:
+  - pxe.atftp
   - pxe.pxe
   - pxe.harvester