From 8bb7f53283fff46f6d0bfafcbba6c431da390fed Mon Sep 17 00:00:00 2001 From: Adw8 Date: Mon, 23 Sep 2024 14:38:49 +0530 Subject: [PATCH] Add directory for vars files --- service-provider-setup/.gitignore | 8 ++++---- service-provider-setup/README.md | 5 +++-- service-provider-setup/deploy-backend.yml | 8 ++++---- service-provider-setup/setup-container-registry.yml | 4 ++-- service-provider-setup/setup-dns.yml | 2 +- service-provider-setup/setup-k8s.yml | 4 ++-- service-provider-setup/templates/laconic.yml.j2 | 4 ++-- .../{ => vars}/container-vars.example.yml | 0 service-provider-setup/{ => vars}/dns-vars.example.yml | 0 service-provider-setup/{ => vars}/k8s-vars.example.yml | 0 service-provider-setup/vars/webapp-vars.example.yml | 3 +++ service-provider-setup/webapp-vars.example.yml | 1 - 12 files changed, 21 insertions(+), 18 deletions(-) rename service-provider-setup/{ => vars}/container-vars.example.yml (100%) rename service-provider-setup/{ => vars}/dns-vars.example.yml (100%) rename service-provider-setup/{ => vars}/k8s-vars.example.yml (100%) create mode 100644 service-provider-setup/vars/webapp-vars.example.yml delete mode 100644 service-provider-setup/webapp-vars.example.yml diff --git a/service-provider-setup/.gitignore b/service-provider-setup/.gitignore index ccc813f..a27004d 100644 --- a/service-provider-setup/.gitignore +++ b/service-provider-setup/.gitignore @@ -1,4 +1,4 @@ -dns-vars.yml -k8s-vars.yml -container-vars.yml -webapp-vars.yml +vars/dns-vars.yml +vars/k8s-vars.yml +vars/container-vars.yml +vars/webapp-vars.yml diff --git a/service-provider-setup/README.md b/service-provider-setup/README.md index 1e6b769..e75703d 100644 --- a/service-provider-setup/README.md +++ b/service-provider-setup/README.md @@ -14,13 +14,14 @@ To get started, follow the [installation](../README.md#installation) guide to se ### Create DNS entries in DigitalOcean -- Copy the [`dns-vars.example.yml`](./dns-vars.example.yml) vars file +- Copy the [`dns-vars.example.yml`](./vars/dns-vars.example.yml) file ```bash + cd vars/ cp dns-vars.example.yml dns-vars.yml ``` -- Enter the `dns-vars.yml` file +- Set the following values in the `dns-vars.yml` file ```bash # primary domain for which DNS records will be managed diff --git a/service-provider-setup/deploy-backend.yml b/service-provider-setup/deploy-backend.yml index 24cd536..be8dfd0 100644 --- a/service-provider-setup/deploy-backend.yml +++ b/service-provider-setup/deploy-backend.yml @@ -6,10 +6,10 @@ KUBECONFIG: "{{ ansible_env.HOME }}/.kube/config-default.yaml" vars_files: - - webapp-vars.yml - - container-vars.yml - - k8s-vars.yml - - dns-vars.yml + - vars/webapp-vars.yml + - vars/container-vars.yml + - vars/k8s-vars.yml + - vars/dns-vars.yml tasks: - name: Ensure gpg-keys directory exists diff --git a/service-provider-setup/setup-container-registry.yml b/service-provider-setup/setup-container-registry.yml index 6f78e7a..2d44e27 100644 --- a/service-provider-setup/setup-container-registry.yml +++ b/service-provider-setup/setup-container-registry.yml @@ -5,8 +5,8 @@ PATH: "{{ ansible_env.PATH }}:/home/{{ansible_user}}/bin" vars_files: - - k8s-vars.yml - - container-vars.yml + - vars/k8s-vars.yml + - vars/container-vars.yml tasks: - name: Generate the spec file for the container-registry stack diff --git a/service-provider-setup/setup-dns.yml b/service-provider-setup/setup-dns.yml index 3317745..8324a3c 100644 --- a/service-provider-setup/setup-dns.yml +++ b/service-provider-setup/setup-dns.yml @@ -2,7 +2,7 @@ hosts: localhost vars_files: - - dns-vars.yml + - vars/dns-vars.yml tasks: - name: Create a domain diff --git a/service-provider-setup/setup-k8s.yml b/service-provider-setup/setup-k8s.yml index 1fe9a1c..d472e9b 100644 --- a/service-provider-setup/setup-k8s.yml +++ b/service-provider-setup/setup-k8s.yml @@ -9,8 +9,8 @@ VAULT_KEY: "{{ vault_passphrase }}" vars_files: - - k8s-vars.yml - - dns-vars.yml + - vars/k8s-vars.yml + - vars/dns-vars.yml tasks: - name: Install Python and pip diff --git a/service-provider-setup/templates/laconic.yml.j2 b/service-provider-setup/templates/laconic.yml.j2 index 0f4b79b..6c65e77 100644 --- a/service-provider-setup/templates/laconic.yml.j2 +++ b/service-provider-setup/templates/laconic.yml.j2 @@ -1,7 +1,7 @@ services: registry: - rpcEndpoint: 'http://{{ cluster_control_ip }}:26657' - gqlEndpoint: 'http://{{ cluster_control_ip }}:9473/api' + rpcEndpoint: 'http://{{ subdomain_cluster_control }}.{{ dns_domain }}.com:26657' + gqlEndpoint: 'http://{{ subdomain_cluster_control}}.{{ dns_domain }}.com:9473/api' userKey: "{{ ALICE_PK }}" bondId: "{{ BOND_ID }}" chainId: lorotestnet-1 diff --git a/service-provider-setup/container-vars.example.yml b/service-provider-setup/vars/container-vars.example.yml similarity index 100% rename from service-provider-setup/container-vars.example.yml rename to service-provider-setup/vars/container-vars.example.yml diff --git a/service-provider-setup/dns-vars.example.yml b/service-provider-setup/vars/dns-vars.example.yml similarity index 100% rename from service-provider-setup/dns-vars.example.yml rename to service-provider-setup/vars/dns-vars.example.yml diff --git a/service-provider-setup/k8s-vars.example.yml b/service-provider-setup/vars/k8s-vars.example.yml similarity index 100% rename from service-provider-setup/k8s-vars.example.yml rename to service-provider-setup/vars/k8s-vars.example.yml diff --git a/service-provider-setup/vars/webapp-vars.example.yml b/service-provider-setup/vars/webapp-vars.example.yml new file mode 100644 index 0000000..ede7205 --- /dev/null +++ b/service-provider-setup/vars/webapp-vars.example.yml @@ -0,0 +1,3 @@ +authority_name: "" +ALICE_PK: "" +BOND_ID: "" diff --git a/service-provider-setup/webapp-vars.example.yml b/service-provider-setup/webapp-vars.example.yml deleted file mode 100644 index 2d81901..0000000 --- a/service-provider-setup/webapp-vars.example.yml +++ /dev/null @@ -1 +0,0 @@ -authority_name: ""