From 22d53e218c1b9062104e266f06e1261d519ffea3 Mon Sep 17 00:00:00 2001 From: Clement Verna Date: Wed, 20 Nov 2019 15:37:32 +0100 Subject: [PATCH] OSBS: Use the env variable to make the reactor-config and client config name unique per env. Signed-off-by: Clement Verna --- playbooks/groups/osbs-cluster.yml | 4 ++-- roles/osbs-namespace/tasks/orchestrator.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/playbooks/groups/osbs-cluster.yml b/playbooks/groups/osbs-cluster.yml index 2b7daf2c79..9b427e8b0e 100644 --- a/playbooks/groups/osbs-cluster.yml +++ b/playbooks/groups/osbs-cluster.yml @@ -442,7 +442,7 @@ - role: osbs-secret osbs_secret_name: reactor-config-secret osbs_secret_files: - - source: "/tmp/{{ osbs_namespace }}-reactor-config-secret.yml" + - source: "/tmp/{{ osbs_namespace }}-{{ env }}-reactor-config-secret.yml" dest: config.yaml tags: - osbs-orchestrator-namespace @@ -469,7 +469,7 @@ - role: osbs-secret osbs_secret_name: client-config-secret osbs_secret_files: - - source: "/tmp/{{ osbs_namespace }}-client-config-secret.conf" + - source: "/tmp/{{ osbs_namespace }}-{{ env }}-client-config-secret.conf" dest: osbs.conf tags: - osbs-orchestrator-namespace diff --git a/roles/osbs-namespace/tasks/orchestrator.yml b/roles/osbs-namespace/tasks/orchestrator.yml index 85bf503ef1..302248646e 100644 --- a/roles/osbs-namespace/tasks/orchestrator.yml +++ b/roles/osbs-namespace/tasks/orchestrator.yml @@ -3,7 +3,7 @@ local_action: > template src=reactor-config-secret.yml.j2 - dest="{{ osbs_generated_config_path }}/{{ osbs_namespace }}-reactor-config-secret.yml" + dest="{{ osbs_generated_config_path }}/{{ osbs_namespace }}-{{ env }}-reactor-config-secret.yml" register: yaml_reactor_config_secret tags: - oc @@ -12,7 +12,7 @@ local_action: > template src=client-config-secret.conf.j2 - dest="{{ osbs_generated_config_path }}/{{ osbs_namespace }}-client-config-secret.conf" + dest="{{ osbs_generated_config_path }}/{{ osbs_namespace }}-{{ env }}-client-config-secret.conf" register: yaml_client_config_secret tags: - oc