diff --git a/.gitignore b/.gitignore index c2039e38bcc71700426d1571e95fa48c2d911701..9c4220ae311ecebdc35f5d9d2e7d0b570fb4f22a 100644 --- a/.gitignore +++ b/.gitignore @@ -150,5 +150,7 @@ creds/servicebruker.sh creds/*.pem cred/*.key +.vs/ + # logs -source/*.log \ No newline at end of file +source/*.log diff --git a/creds/worker.crt b/creds/worker.crt deleted file mode 100644 index ccb753376cac2748f78d7ea620cb4043a4a04b72..0000000000000000000000000000000000000000 --- a/creds/worker.crt +++ /dev/null @@ -1,31 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIFSDCCAzACCQDKtYKLcx0WSDANBgkqhkiG9w0BAQsFADBmMQswCQYDVQQGEwJO -TzESMBAGA1UECAwJSW5ubGFuZGV0MREwDwYDVQQHDAhHasODwrh2aTENMAsGA1UE -CgwETlROVTENMAsGA1UECwwEU1RVRDESMBAGA1UEAwwJbG9jYWxob3N0MB4XDTIy -MDMxNDIxMDg1N1oXDTMyMDMxMTIxMDg1N1owZjELMAkGA1UEBhMCTk8xEjAQBgNV -BAgMCUlubmxhbmRldDERMA8GA1UEBwwIR2rDg8K4dmkxDTALBgNVBAoMBE5UTlUx -DTALBgNVBAsMBFNUVUQxEjAQBgNVBAMMCWxvY2FsaG9zdDCCAiIwDQYJKoZIhvcN -AQEBBQADggIPADCCAgoCggIBANDIY8ADgL1VO/VQ1j/wMGenn6+mF7nD/sw9NfI6 -oOI7BUa25UMFBY0nEgoeAnXXFAVFA7Ts/CiTiGwypPyYYLuPz8UrX/yDjL+mkgiF -RJo8t6XtA1mb4xW1tlBaZX6BFVVXjssa4lzx6RzqvCISyQkLiSVhhH3Km8N7oK7j -p7sZm4G54+2tnZ/5dGXjhZgpd45qWb1HG38g3moP8279IaOQAY3CUw0MYit75RVz -iJKIUdZDlNEdVX94OBUmL8nA5s3yq0IqVtLnuEC89r0C+P5DVpHiwcfupp5XiXxz -LqMSyMEFNb3jlOBmH0F1h6d5Gz0kSU6pbVRWbKayPXXMBwOnEnDSVEzDnMsX+WEC -SgATJ8jiHYgc3NihVi7+cl6baSTK632Iw1YjF+brEmjUvvq+T+C6yWt7zQtpYSsR -1pINU5z5gq1/JlBj1kzexzUU7epQbbrDtkD5Rs1e7L76uHKGXhCaC+m9ux9ehAPs -j0gADKkNK+Cy9B7unarH7TyP0xta1MJbVqUdCMB3ijMqDyr4RptKakK70c7TvD2N -jSu7G+cHYwiW77cOv+Uj7ZpwhifZhXrx8NQk+Cie9UmAClE3R++mDCPCv/xwc3nv -6AfqdRWz/SBJQxuHXs6HJI0e43h8NTpKHLaPHMYIkkfX0XWQ2FGZq3nuQ4pJnbwI -2ckxAgMBAAEwDQYJKoZIhvcNAQELBQADggIBABmX7aR1xi6jUSKyfvS4IoqDSMyq -zTJcKcswxHn3iyEjXjCUMdf0/nlHMWxMkuQJpi8+qog8iz7wTQFEbkuzH9GJa55T -o2sASYO5ZgIsoepTcmYagpMNQNLR003UxiJejIeUjLdNaRjzfb2ZDGsFoaut82jU -Mp/I8tVmfyN6Vv9WLj/s6OFJLa5BA88fXagt+mu/uhXSSCzNaAOXgjIKnMt2MRBy -cZP9jh0H0Y188m4jcqIywfXiMmNDXZi47ggn7SGOhAWvvoF2LaCHVR8zFEU+mf28 -DjOo45/kkDdSbea3ZsIbX9ICryj/IKuBYSvqdHLKioEwPVqVSBkvIoqYAGWlWlbt -OgYAgKPcv6yWy6FekRq4hFKKcUBbdmWk4eRii1KA0sy5rC37oQxmhZLr3EdZSzf7 -6uOF6ZCh6/4YC5XujdKhZNr/0kNeXJeIVy/efYr1VzLBabSAnjvvMZN/xISvRipr -gcTGk0X1qsCIX1OltkKaNCinnGlef/SM4Es/7UXnhcMsnNorvG9FLf1jL+jhK2UX -ALseIMgZAqavOCvCOsxTxv/Pbjp00pohFJp99pZaSf+XIDNVx64PqU11MQiWNhLR -D8UvgpoF4B210L2q2YdxB+XECIDQG1CByDonuM7v6B1b37SP6GWxuaPu8fuXHMqa -YSiYhTnoslghIN2E ------END CERTIFICATE----- diff --git a/creds/worker.key b/creds/worker.key deleted file mode 100644 index 0f6efc4ff3d63804feb4286dbc34a2aa4ebeaa9b..0000000000000000000000000000000000000000 --- a/creds/worker.key +++ /dev/null @@ -1,52 +0,0 @@ ------BEGIN PRIVATE KEY----- -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 -Mc/lJhCQmqM1Jm1s35xmFrTKcbyLRA== ------END PRIVATE KEY----- diff --git a/source/orchestrationLogic/HEAT/base.yaml b/source/orchestrationLogic/HEAT/base.yaml index 7ea053343d208ca3fa2a418144477ff3e333df50..5715acf729cb4c2df6abe7347cd03f7e5014b99d 100644 --- a/source/orchestrationLogic/HEAT/base.yaml +++ b/source/orchestrationLogic/HEAT/base.yaml @@ -1,3 +1,5 @@ +# The documentation for Openstack Heat resources were rappidly +# used: https://docs.openstack.org/heat/rocky/template_guide/openstack.html heat_template_version: 2018-08-31 description: > diff --git a/source/orchestrationLogic/HEAT/dc.yaml b/source/orchestrationLogic/HEAT/dc.yaml index 23f87eeb61396de7b61e7477a92106f66badb84a..77e01fae7204d470ab6205b18efde130deb16ddd 100644 --- a/source/orchestrationLogic/HEAT/dc.yaml +++ b/source/orchestrationLogic/HEAT/dc.yaml @@ -1,3 +1,5 @@ +# The documentation for Openstack Heat resources were rappidly +# used: https://docs.openstack.org/heat/rocky/template_guide/openstack.html heat_template_version: 2018-08-31 parameters: diff --git a/source/orchestrationLogic/HEAT/fileserver.yaml b/source/orchestrationLogic/HEAT/fileserver.yaml index 6d368de241e2c7cea46a5426d18f7d3048433688..b6144b1f2f80b7491a2afefcf5cfa676c3edd569 100644 --- a/source/orchestrationLogic/HEAT/fileserver.yaml +++ b/source/orchestrationLogic/HEAT/fileserver.yaml @@ -1,3 +1,5 @@ +# The documentation for Openstack Heat resources were rappidly +# used: https://docs.openstack.org/heat/rocky/template_guide/openstack.html heat_template_version: 2018-08-31 description: > diff --git a/source/orchestrationLogic/HEAT/filevolume.yaml b/source/orchestrationLogic/HEAT/filevolume.yaml index 8e1b1841ce8ee8ba138ff1931157aae527573b4e..4af795971e065a9916113047c03e8e159a97228d 100755 --- a/source/orchestrationLogic/HEAT/filevolume.yaml +++ b/source/orchestrationLogic/HEAT/filevolume.yaml @@ -1,3 +1,5 @@ +# The documentation for Openstack Heat resources were rappidly +# used: https://docs.openstack.org/heat/rocky/template_guide/openstack.html heat_template_version: 2018-08-31 description: > diff --git a/source/orchestrationLogic/HEAT/lb.yaml b/source/orchestrationLogic/HEAT/lb.yaml index 813fa62a681fd9515633bf5623c5daa55fbaee28..39582cd18c6f61a689c8afb8402695f22039b6c1 100644 --- a/source/orchestrationLogic/HEAT/lb.yaml +++ b/source/orchestrationLogic/HEAT/lb.yaml @@ -1,7 +1,7 @@ # The code below is for the load balancer, it includes load balancing for # rdp and sftp. The documentation for openstack resource types were used # to know what resources and properties were necassary for the balancnig -# logic +# logic https://docs.openstack.org/heat/rocky/template_guide/openstack.html heat_template_version: 2018-08-31 parameters: diff --git a/source/orchestrationLogic/HEAT/project.yaml b/source/orchestrationLogic/HEAT/project.yaml index be216109436af1a551627340dceb8f7424c13e82..5f9b24185d139462657bbc17ffdbfdb204a2f6c2 100644 --- a/source/orchestrationLogic/HEAT/project.yaml +++ b/source/orchestrationLogic/HEAT/project.yaml @@ -1,3 +1,5 @@ +# The documentation for Openstack Heat resources were rappidly +# used: https://docs.openstack.org/heat/rocky/template_guide/openstack.html heat_template_version: 2018-08-31 description: Master template for project. @@ -71,7 +73,7 @@ resources: heat_network_subnet: { get_attr: [ base, resource.heat_network_subnet ] } # This solution was inspired from Lars Erik Pedersens (NTNU IT-Division) - # proposal + # proposal https://github.com/LarsErikP/heat-examples/tree/main/lbtest clients: type: OS::Heat::ResourceGroup properties: diff --git a/source/orchestrationLogic/HEAT/rdp_lb_member.yaml b/source/orchestrationLogic/HEAT/rdp_lb_member.yaml index b9ed0768ee822e5d4548cbe5a10e8024559dfc63..af431054ed913d99f8f6c8f0357d83c23b960261 100644 --- a/source/orchestrationLogic/HEAT/rdp_lb_member.yaml +++ b/source/orchestrationLogic/HEAT/rdp_lb_member.yaml @@ -25,6 +25,8 @@ parameters: type: string description: RDP members to inject + # This solution was inspired from Lars Erik Pedersens (NTNU IT-Division) + # proposal https://github.com/LarsErikP/heat-examples/tree/main/lbtest resources: server: type: OS::Nova::Server