service-provider-setup/README.md

@@ -34,7 +34,6 @@
   ```bash
   # vars/dns-vars.yml
   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...
 
@@ -44,10 +43,8 @@
   gpg_passphrase: ""                # passphrase for securing the GPG key
 
   # vars/k8s-vars.yml
-  target_host: "deployment_host"
   org_id: ""                        # eg: lcn
   location_id: ""                   # eg: cad
-  base_domain: ""               # eg: laconic
   support_email: ""                 # eg: support@laconic.com
 
   # vars/container-vars.yml
@@ -58,14 +55,14 @@
   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: laconic-authority
+  cpu_reservation: "1"              # minimum number of cpu cores to be used, eg: 2
+  memory_reservation: "2G"          # minimum amount of memory in GB to be used, eg: 4G
+  cpu_limit: "6"                    # maximum number of cpu cores to be used, eg: 6
+  memory_limit: "8G"                # 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: true
-  auction_bid_amount: ""      # bid amount for deployment auctions in alnt, eg: 500000
+  handle_auction_requests: "true"   # whether the webapp deployer should handle deployment auction requests, eg: true
+  auction_bid_amount: "100000"      # bid amount for deployment auctions in alnt, eg: 500000
   ```
 
 - Update the [`hosts.ini`](./hosts.ini) file:

service-provider-setup/setup-k8s.yml

@@ -124,10 +124,10 @@
         src: ./templates/k8s.yml.j2
         dest: "{{ ansible_env.HOME }}/service-provider-template/group_vars/{{ org_id }}_{{ location_id }}/k8s.yml"
 
-    - name: Copy wildcard-pwa-{{ base_domain }}.yaml to the remote VM
+    - name: Copy wildcard template to the remote VM
       template:
         src: ./templates/wildcard-pwa-example.yml.j2
-        dest: "{{ ansible_env.HOME }}/service-provider-template/files/manifests/wildcard-pwa-{{ base_domain }}.yaml"
+        dest: "{{ ansible_env.HOME }}/service-provider-template/files/manifests/wildcard-pwa-{{ full_domain | replace('.', '-') }}.yaml"
 
     - name: Delete old wildcard-pwa file
       file:

service-provider-setup/templates/k8s.yml.j2

@@ -52,4 +52,4 @@ k8s_manifests:
   # initiate wildcard cert
   - name: pwa.{{ full_domain }}
     type: file
-    source: wildcard-pwa-{{ base_domain }}.yaml
+    source: wildcard-pwa-{{ full_domain | replace('.', '-') }}.yaml

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

@@ -1,5 +1,5 @@
 full_domain: ""
-subdomain_prefix: ""
+subdomain_prefix: "{{ org_id }}-{{ location_id }}"
 subdomain_cluster_control: "{{ subdomain_prefix }}-cluster-control"
 service_provider_ip: ""
 do_api_token: ""

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

@@ -2,6 +2,5 @@ gpg_key_id: "{{ sec_key_id }}"
 vault_passphrase: "{{ gpg_passphrase }}"
 org_id: ""
 location_id: ""
-base_domain: ""
 support_email: ""
 ansible_ssh_extra_args: '-o StrictHostKeyChecking=no'

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

@@ -1,10 +1,10 @@
 ALICE_PK: "{{ ALICE_PK }}"
 BOND_ID: "{{ BOND_ID }}"
 authority_name: ""
-cpu_reservation: ""
-memory_reservation: ""
+cpu_reservation: "1"
+memory_reservation: "2G"
 cpu_limit: "6"
 memory_limit: "8G"
 deployer_gpg_passphrase: ""
-handle_auction_requests: "false"
-auction_bid_amount: "0"
+handle_auction_requests: "true"
+auction_bid_amount: "100000"