From d6a61a42e423349d55f9415cb49fc9fd51859095 Mon Sep 17 00:00:00 2001
From: H4CK3R-01 <florian@flokaiser.com>
Date: Fri, 7 Apr 2023 23:12:31 +0200
Subject: [PATCH] Removed registry login

---
 ansible/provision.yml            | 12 +-----------
 terraform/deploy.tf              | 12 +-----------
 terraform/secrets.tfvars.example |  4 +---
 3 files changed, 3 insertions(+), 25 deletions(-)

diff --git a/ansible/provision.yml b/ansible/provision.yml
index c1a3010..8a370ae 100644
--- a/ansible/provision.yml
+++ b/ansible/provision.yml
@@ -28,12 +28,6 @@
       ansible.builtin.pip:
         name: docker-compose
 
-    - name: Log into registry
-      docker_login:
-        registry: registry.flokaiser.com
-        username: "{{ REGISTRY_USERNAME }}"
-        password: "{{ REGISTRY_PASSWORD }}"
-
     - name: clone repository
       ansible.builtin.git:
         repo: https://git.flokaiser.com/DHBW/Cloud_Computing_II.git
@@ -52,8 +46,4 @@
         AZURE_KEY: "{{ AZURE_KEY }}"
         AZURE_LOCATION: "{{ AZURE_LOCATION }}"
         AZURE_ENDPOINT: "https://api.cognitive.microsofttranslator.com"
-        ENV: "dev"
-
-    - name: Log out of DockerHub
-      docker_login:
-        state: absent
\ No newline at end of file
+        ENV: "dev"
\ No newline at end of file
diff --git a/terraform/deploy.tf b/terraform/deploy.tf
index a952d24..abb817c 100644
--- a/terraform/deploy.tf
+++ b/terraform/deploy.tf
@@ -52,16 +52,6 @@ variable "cloudflare_token" {
   sensitive = true
 }
 
-variable "registry_username" {
-  type = string
-  sensitive = true
-}
-
-variable "registry_password" {
-  type = string
-  sensitive = true
-}
-
 resource "random_string" "lower" {
   length  = 16
   upper   = false
@@ -242,6 +232,6 @@ resource "azurerm_linux_virtual_machine" "example" {
 
   # Ansible
   provisioner "local-exec" {
-    command = "ansible-playbook --ssh-common-args='-o StrictHostKeyChecking=no' --extra-vars CERTBOT_EMAIL='${var.certbot_email}' --extra-vars REGISTRY_USERNAME='${var.registry_username}' --extra-vars REGISTRY_PASSWORD='${var.registry_password}' --extra-vars AZURE_KEY='${azurerm_cognitive_account.example.primary_access_key}' --extra-vars AZURE_LOCATION='${var.azure_location_ca}' --extra-vars DATABASE_URL='${azurerm_cosmosdb_account.example.connection_strings.0}' -i adminuser@'${azurerm_public_ip.example.ip_address}', ../ansible/provision.yml"
+    command = "ansible-playbook --ssh-common-args='-o StrictHostKeyChecking=no' --extra-vars CERTBOT_EMAIL='${var.certbot_email}' --extra-vars AZURE_KEY='${azurerm_cognitive_account.example.primary_access_key}' --extra-vars AZURE_LOCATION='${var.azure_location_ca}' --extra-vars DATABASE_URL='${azurerm_cosmosdb_account.example.connection_strings.0}' -i adminuser@'${azurerm_public_ip.example.ip_address}', ../ansible/provision.yml"
   }
 }
diff --git a/terraform/secrets.tfvars.example b/terraform/secrets.tfvars.example
index 3e5fddf..7b19609 100644
--- a/terraform/secrets.tfvars.example
+++ b/terraform/secrets.tfvars.example
@@ -5,6 +5,4 @@ azure_location_ca = "germanywestcentral"
 azure_location = "westeurope"
 certbot_email = ""
 zone_id = ""
-cloudflare_token = ""
-registry_username = ""
-registry_password = ""
\ No newline at end of file
+cloudflare_token = ""
\ No newline at end of file