service-provider-setup/README.md

@@ -96,12 +96,12 @@ To get started, follow the [installation](../README.md#installation) guide to se
   full_domain: ""               # eg: laconic.com
   subdomain_prefix: ""          # eg: lcn-cad
   service_provider_ip: ""        # eg: 23.111.78.179
-  do_api_token: ""              # DigitalOcean access token that you generated, eg: dop_v1...
+  do_api_token: ""              # Digital Ocean access token that you generated, eg: dop_v1...
 
   # vars/gpg-vars.yml
-  gpg_user_name: ""         # full name of the user for the GPG key
-  gpg_user_email: ""        # email address associated with the GPG key
-  gpg_passphrase: ""        # passphrase for securing the GPG key
+  gpg_user_name: ""         # Full name of the user for the GPG key
+  gpg_user_email: ""        # Email address associated with the GPG key
+  gpg_passphrase: ""        # Passphrase for securing the GPG key
 
   # vars/k8s-vars.yml
   target_host: "deployment_host"
@@ -118,14 +118,12 @@ To get started, follow the [installation](../README.md#installation) guide to se
   chain_id: "" # chain id to use for the Laconic chain
 
   # vars/webapp-vars.yml
-  authority_name: ""          # eg: my-org-name
-  cpu_reservation: ""         # minimum number of cpu cores to be used, eg: 2
-  memory_reservation: ""      # minimum amount of memory in GB to be used, eg: 4G
-  cpu_limit: ""               # maximum number of cpu cores to be used, eg: 6
-  memory_limit: ""            # maximum amount of memory in GB to be used, eg: 8G
+  authority_name: ""      # eg: my-org-name
+  cpu_reservation: ""     # Minimum number of cpu cores to be used, eg: 2
+  memory_reservation: ""  # Minimum amount of memory in GB to be used, eg: 4G
+  cpu_limit: ""           # Maximum number of cpu cores to be used, eg: 6
+  memory_limit: ""        # Maximum amount of memory in GB to be used, eg: 8G
   deployer_gpg_passphrase: "" # passphrase for creating GPG key used by webapp-deployer, eg: SECRET
-  handle_auction_requests: "" # whether the webapp deployer should handle deployment auction requests, eg: false
-  auction_bid_amount: ""      # bid amount for deployment auctions in alnt, eg: 50000
   ```
 
 - Update the [`hosts.ini`](./hosts.ini) file:

service-provider-setup/setup-dns.yml

@@ -6,16 +6,6 @@
     - vars/k8s-vars.yml
 
   tasks:
-    - name: Check if domain exists
-      community.digitalocean.digital_ocean_domain_facts:
-        oauth_token: "{{ do_api_token }}"
-      register: existing_domains
-
-    - name: Fail if domain already exists
-      fail:
-        msg: "Domain {{ full_domain }} already exists."
-      when: full_domain in existing_domains.data | map(attribute='name') | list
-
     - name: Create a domain
       community.digitalocean.digital_ocean_domain:
         state: present
@@ -129,4 +119,4 @@
         data: "{{ subdomain_prefix }}-cluster-control.{{ full_domain }}"
         domain: "{{ full_domain }}"
         type: CNAME
-        ttl: 43200
+        ttl: 43200

service-provider-setup/templates/configs/webapp-deployer-config.env.j2

@@ -26,5 +26,3 @@ export OPENPGP_PASSPHRASE="{{ deployer_gpg_passphrase }}"
 export DEPLOYER_STATE="srv-test/deployments/autodeploy.state"
 export UNDEPLOYER_STATE="srv-test/deployments/autoundeploy.state"
 export UPLOAD_DIRECTORY="srv-test/uploads"
-export HANDLE_AUCTION_REQUESTS={{ handle_auction_requests }}
-export AUCTION_BID_AMOUNT={{ auction_bid_amount }}

service-provider-setup/vars/k8s-vars.example.yml

@@ -1,3 +1,4 @@
+target_host: "deployment_host"
 gpg_key_id: "{{ sec_key_id }}"
 vault_passphrase: "{{ gpg_passphrase }}"
 org_id: ""

service-provider-setup/vars/webapp-vars.example.yml

@@ -6,5 +6,3 @@ memory_reservation: ""
 cpu_limit: "6"
 memory_limit: "8G"
 deployer_gpg_passphrase: ""
-handle_auction_requests: "false"
-auction_bid_amount: "0"