From d5708678737faafcd58ab5c2eccf53ef5f80960d Mon Sep 17 00:00:00 2001
From: S M Y <smy.altamash@gmail.com>
Date: Tue, 20 Aug 2019 17:26:48 +0530
Subject: [PATCH] Test
---
ansible/roles/stack-proxy/tasks/main.yml | 34 +++++++++---------------
1 file changed, 12 insertions(+), 22 deletions(-)
diff --git a/ansible/roles/stack-proxy/tasks/main.yml b/ansible/roles/stack-proxy/tasks/main.yml
index 749f30bdb..5f14abbb4 100644
--- a/ansible/roles/stack-proxy/tasks/main.yml
+++ b/ansible/roles/stack-proxy/tasks/main.yml
@@ -32,9 +32,12 @@
- name: Save proxy-default.conf
template: src=proxy-default.conf dest=/home/deployer/config/proxy-default.conf mode=0644
-- name: Save keycloak.conf
- template: src=keycloak.conf dest=/home/deployer/config/keycloak.conf mode=0644
- when: merge_proxy_server_name is not none
+- name: Save sunbird-space.conf
+ template: src=sunbird-space.conf dest=/home/deployer/config/sunbird-space.conf mode=0644
+ when: sunbird_space_url is not none
+
+#- name: Save proxy-default.conf
+# template: src=proxy-default.conf dest=/home/deployer/config/proxy-default.conf mode=0644
- name: Remove old style proxy stack
shell: "docker stack rm {{image_name}}-{{env}}"
@@ -51,20 +54,6 @@
ignore_errors: true
# Ignoring ssl certs while proto=https mode
-- name: Remove docker secrets for merge {{ item.name }}
- shell: "docker secret rm {{ item.name }}"
- with_items: "{{ merge_proxy_secrets }}"
- when: merge_proxy_server_name is not none
- ignore_errors: true
- no_log: true
-
-- name: Create docker secrets for merge {{ item.name }}
- shell: "echo '{{item.value}}' | docker secret create {{item.name}} -"
- with_items: "{{ merge_proxy_secrets }}"
- when: merge_proxy_server_name is not none
- ignore_errors: true
- no_log: true
-
- name: Remove docker secrets {{ item.name }}
shell: "docker secret rm {{ item.name }}"
with_items: "{{ proxy_secrets }}"
@@ -85,8 +74,9 @@
shell: "docker config rm proxy-default.conf"
ignore_errors: yes
-- name: Remove old keycloak.conf docker config
- shell: "docker config rm keycloak.conf"
+- name: Remove old sapce-config.conf docker config
+ shell: "docker config rm sunbird-space.conf"
+ when: sunbird_space_url is not none
ignore_errors: yes
- name: Save nginx.conf as docker config
@@ -95,9 +85,9 @@
- name: Save proxy-default.conf as docker config
shell: "docker config create proxy-default.conf /home/deployer/config/proxy-default.conf"
-- name: Save keycloak.conf as docker config
- shell: "docker config create keycloak.conf /home/deployer/config/keycloak.conf"
- when: merge_proxy_server_name is not none
+- name: Save sunbird space as docker config
+ shell: "docker config create space-config.conf /home/deployer/config/space-config.conf"
+ when: sunbird_space_url is not none
- name: Login to docker
shell: "docker login {{ vault_docker_registry_url }} -u {{ vault_docker_registry_user }} -p {{ vault_docker_registry_password }}"
--
GitLab