removed old services; added new ones

Signed-off-by: Travis Cotton <trcotton@lanl.gov>

Author: travisbcotton

systemd/containers/boot-service.service

@@ -0,0 +1,32 @@
+[Unit]
+Description=The bss container
+#PartOf=openchami.target
+
+# Ensure the init job has started (and if it fails, BSS will fail):
+Requires=tokensmith.service smd.service
+After=tokensmith.service smd.service
+
+[Container]
+ContainerName=boot-service
+HostName=boot-service
+Image=boot-service:test
+
+# Environment Variables
+#EnvironmentFile=/etc/openchami/configs/openchami.env
+
+#Volume=/etc/openchami/configs/boot-service.yaml:/etc/boot-service/config.yaml:ro,Z
+
+# Secrets
+Secret=bss-bootstrap-token,type=env,target=TOKENSMITH_BOOTSTRAP_TOKEN
+
+# Networks for the Container to use
+Network=openchami-internal.network
+
+# Proxy settings
+PodmanArgs=--http-proxy=false
+
+Exec=serve --enable-auth --tokensmith_url=http://tokensmith:8080 --hsm-url=http://smd:27779 --tokensmith-target-service smd
+
+[Service]
+ExecStartPre=/usr/local/sbin/tokensmith_bootstrap_token.sh bss
+Restart=always

systemd/containers/coresmd-coredhcp.container

@@ -1,7 +1,7 @@
 [Unit]
 Description=The CoreSMD CoreDHCP container
-Wants=haproxy.service
-After=haproxy.service
+Wants=tokensmith.service
+After=tokensmith.service
 PartOf=openchami.target
 
 [Container]

systemd/containers/haproxy.container

@@ -1,7 +1,7 @@
 [Unit]
 Description=The haproxy container
-Wants=bss.service cloud-init-server.service smd.service acme-deploy.service
-After=openchami-external-network.service opaal.service smd.service bss.service acme-deploy.service cloud-init-server.service
+Wants=boot-service.service metadata-service.service smd.service acme-deploy.service
+After=openchami-external-network.service smd.service boot-service.service acme-deploy.service metadata-service.service
 Requires=openchami-external-network.service acme-deploy.service
 PartOf=openchami.target
 

systemd/containers/metadata-service.service

@@ -0,0 +1,24 @@
+[Unit]
+Description=The metadata-service container
+Wants=smd.service
+After=smd.service tokensmith.service
+PartOf=openchami.target
+
+[Container]
+ContainerName=metadata-service
+HostName=cloud-init
+Image=metadata-service:test
+
+Volume=cloud-init-data:/cloud-init:rw,Z
+
+# Environment Variables
+EnvironmentFile=/etc/openchami/configs/openchami.env
+
+# Networks for the Container to use
+Network=openchami-internal.network
+
+# Proxy settings
+PodmanArgs=--http-proxy=false
+
+[Service]
+Restart=always

systemd/containers/tokensmith.container

@@ -1,13 +1,11 @@
 [Unit]
 Description=The tokensmith container
-Wants=hydra-gen-jwks.service
-After=hydra-gen-jwks.service
 PartOf=openchami.target
 
 [Container]
 ContainerName=tokensmith
 HostName=tokensmith
-Image=ghcr.io/openchami/tokensmith:pr-13
+Image=ghcr.io/openchami/tokensmith:pr-19
 EnvironmentFile=/etc/openchami/configs/openchami.env
 
 # Volumes