From 487de043ea52bf097a4cb20e0461037574459d5a Mon Sep 17 00:00:00 2001 From: Julia Kreger Date: Mon, 5 Dec 2016 17:39:29 +0000 Subject: [PATCH] Fix keystone config templates The ansible_managed variable was resulting in text being put into the keystone config file that caused keystone to fail. Commenting out the entry to allow the test script to execute successfuly. Change-Id: Ie8ff1f9b8354e4d1411a8714df6a73b6adfd9cd5 --- .../bifrost-keystone-install/templates/keystone-admin.ini.j2 | 2 +- .../bifrost-keystone-install/templates/keystone-public.ini.j2 | 2 +- .../roles/bifrost-keystone-install/templates/keystone.conf.j2 | 2 +- .../roles/bifrost-keystone-install/templates/nginx.conf.j2 | 2 +- .../templates/nginx_conf.d_bifrost-keystone.conf.j2 | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/playbooks/roles/bifrost-keystone-install/templates/keystone-admin.ini.j2 b/playbooks/roles/bifrost-keystone-install/templates/keystone-admin.ini.j2 index 9cfa7aaca..3e0b3156e 100644 --- a/playbooks/roles/bifrost-keystone-install/templates/keystone-admin.ini.j2 +++ b/playbooks/roles/bifrost-keystone-install/templates/keystone-admin.ini.j2 @@ -1,4 +1,4 @@ -{{ ansible_managed }} +# {{ ansible_managed }} [uwsgi] master = true processes = 2 diff --git a/playbooks/roles/bifrost-keystone-install/templates/keystone-public.ini.j2 b/playbooks/roles/bifrost-keystone-install/templates/keystone-public.ini.j2 index 33e5db1a6..8641ae18c 100644 --- a/playbooks/roles/bifrost-keystone-install/templates/keystone-public.ini.j2 +++ b/playbooks/roles/bifrost-keystone-install/templates/keystone-public.ini.j2 @@ -1,4 +1,4 @@ -{{ ansible_managed }} +# {{ ansible_managed }} [uwsgi] master = true processes = 2 diff --git a/playbooks/roles/bifrost-keystone-install/templates/keystone.conf.j2 b/playbooks/roles/bifrost-keystone-install/templates/keystone.conf.j2 index 55fe65293..4933144ae 100644 --- a/playbooks/roles/bifrost-keystone-install/templates/keystone.conf.j2 +++ b/playbooks/roles/bifrost-keystone-install/templates/keystone.conf.j2 @@ -1,4 +1,4 @@ -{{ ansible_managed }} +# {{ ansible_managed }} [DEFAULT] debug = {{ keystone.debug | bool }} diff --git a/playbooks/roles/bifrost-keystone-install/templates/nginx.conf.j2 b/playbooks/roles/bifrost-keystone-install/templates/nginx.conf.j2 index 0054713ff..d80f6fa69 100644 --- a/playbooks/roles/bifrost-keystone-install/templates/nginx.conf.j2 +++ b/playbooks/roles/bifrost-keystone-install/templates/nginx.conf.j2 @@ -1,4 +1,4 @@ -{{ ansible_managed }} +# {{ ansible_managed }} user {{ nginx_user }}; worker_processes 2; pid /run/nginx.pid; diff --git a/playbooks/roles/bifrost-keystone-install/templates/nginx_conf.d_bifrost-keystone.conf.j2 b/playbooks/roles/bifrost-keystone-install/templates/nginx_conf.d_bifrost-keystone.conf.j2 index a048b3484..4259cd74e 100644 --- a/playbooks/roles/bifrost-keystone-install/templates/nginx_conf.d_bifrost-keystone.conf.j2 +++ b/playbooks/roles/bifrost-keystone-install/templates/nginx_conf.d_bifrost-keystone.conf.j2 @@ -1,4 +1,4 @@ -{{ ansible_managed }} +# {{ ansible_managed }} server { listen 5000; access_log /var/log/nginx/keystone/access.log;