diff --git a/.gitignore b/.gitignore index dfb0110..1e9aa60 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,4 @@ .DS_Store vpass +.vscode/settings.json +.gitignore diff --git a/is-registry.yml b/is-registry.yml index caaed9a..9d8139e 100644 --- a/is-registry.yml +++ b/is-registry.yml @@ -3,6 +3,11 @@ #hosts: is_registry_devsec:is_registry_devnext hosts: all tasks: + - name: Set gcube security keys variables properly according to the environment + set_fact: + gcube_security_keys: "{{ gcube_prod_security_keys if infra == 'prod' else gcube_preprod_security_keys if infra == 'pre' else gcube_dev_security_keys }}" + gcube_security_key_legacy: "{{ gcube_prod_security_key_legacy if infra == 'prod' else gcube_preprod_security_key_legacy if infra == 'pre' else gcube_dev_security_key_legacy }}" + # - name: DEBUG # debug: # msg: diff --git a/resource-manager.yml b/resource-manager.yml index 1cb0165..47dc772 100644 --- a/resource-manager.yml +++ b/resource-manager.yml @@ -4,6 +4,11 @@ #hosts: resource_manager_devsec hosts: all tasks: + - name: Set gcube security keys variables properly according to the environment + set_fact: + gcube_security_keys: "{{ gcube_prod_security_keys if infra == 'prod' else gcube_preprod_security_keys if infra == 'pre' else gcube_dev_security_keys }}" + gcube_security_key_legacy: "{{ gcube_prod_security_key_legacy if infra == 'prod' else gcube_preprod_security_key_legacy if infra == 'pre' else gcube_dev_security_key_legacy }}" + # - name: # debug: # # var: complete_start_scope diff --git a/roles/is-registry/tasks/main.yml b/roles/is-registry/tasks/main.yml index 96798d0..8a8cd3b 100644 --- a/roles/is-registry/tasks/main.yml +++ b/roles/is-registry/tasks/main.yml @@ -8,10 +8,10 @@ owner: root group: root -- name: Set gcube security keys variables properly according to the environment - set_fact: - gcube_security_keys: "{{ gcube_prod_security_keys if infra == 'prod' else gcube_preprod_security_keys if infra == 'pre' else gcube_dev_security_keys }}" - gcube_security_key_legacy: "{{ gcube_prod_security_key_legacy if infra == 'prod' else gcube_preprod_security_key_legacy if infra == 'pre' else gcube_dev_security_key_legacy }}" +# - name: Set gcube security keys variables properly according to the environment +# set_fact: +# gcube_security_keys: "{{ gcube_prod_security_keys if infra == 'prod' else gcube_preprod_security_keys if infra == 'pre' else gcube_dev_security_keys }}" +# gcube_security_key_legacy: "{{ gcube_prod_security_key_legacy if infra == 'prod' else gcube_preprod_security_key_legacy if infra == 'pre' else gcube_dev_security_key_legacy }}" - name: Install the docker compose file ansible.builtin.template: diff --git a/roles/resource-manager/tasks/main.yml b/roles/resource-manager/tasks/main.yml index aa2849b..5aa920d 100644 --- a/roles/resource-manager/tasks/main.yml +++ b/roles/resource-manager/tasks/main.yml @@ -8,11 +8,6 @@ owner: root group: root -- name: Set gcube security keys variables properly according to the environment - set_fact: - gcube_security_keys: "{{ gcube_prod_security_keys if infra == 'prod' else gcube_preprod_security_keys if infra == 'pre' else gcube_dev_security_keys }}" - gcube_security_key_legacy: "{{ gcube_prod_security_key_legacy if infra == 'prod' else gcube_preprod_security_key_legacy if infra == 'pre' else gcube_dev_security_key_legacy }}" - - name: Install the docker compose file ansible.builtin.template: src: docker-compose.yml.j2