From a8614e961d4e600f6fbbac23e4c1a279dd1b186a Mon Sep 17 00:00:00 2001
From: liyuenan <liyuenan@huawei.com>
Date: Mon, 28 Nov 2016 13:20:23 +0800
Subject: Fix some xenial baremetal deploy bugs

1. Fix pip upgrade

2. Fix apache conf file

JIRA: COMPASS-489

Change-Id: I2d45114b559298898ab354f884ced74fc9fc7abf
Signed-off-by: liyuenan <liyuenan@huawei.com>
---
 .../roles/ceilometer_controller/templates/wsgi-ceilometer.conf.j2       | 2 +-
 .../roles/dashboard/templates/openstack-dashboard.conf.j2               | 2 +-
 .../roles/keystone/templates/wsgi-keystone.conf.j2                      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'deploy/adapters/ansible/openstack_newton_xenial/roles')

diff --git a/deploy/adapters/ansible/openstack_newton_xenial/roles/ceilometer_controller/templates/wsgi-ceilometer.conf.j2 b/deploy/adapters/ansible/openstack_newton_xenial/roles/ceilometer_controller/templates/wsgi-ceilometer.conf.j2
index a6fd6840..9909f800 100644
--- a/deploy/adapters/ansible/openstack_newton_xenial/roles/ceilometer_controller/templates/wsgi-ceilometer.conf.j2
+++ b/deploy/adapters/ansible/openstack_newton_xenial/roles/ceilometer_controller/templates/wsgi-ceilometer.conf.j2
@@ -1,6 +1,6 @@
 {% set work_threads = (ansible_processor_vcpus + 1) // 2 %}
 {% if work_threads > 10 %}
-    set work_threads = 10
+{%  set work_threads = 10 %}
 {% endif %}
 
 <VirtualHost {{ internal_ip }}:8777>
diff --git a/deploy/adapters/ansible/openstack_newton_xenial/roles/dashboard/templates/openstack-dashboard.conf.j2 b/deploy/adapters/ansible/openstack_newton_xenial/roles/dashboard/templates/openstack-dashboard.conf.j2
index 89a70686..664af687 100755
--- a/deploy/adapters/ansible/openstack_newton_xenial/roles/dashboard/templates/openstack-dashboard.conf.j2
+++ b/deploy/adapters/ansible/openstack_newton_xenial/roles/dashboard/templates/openstack-dashboard.conf.j2
@@ -1,6 +1,6 @@
 {% set work_threads = (ansible_processor_vcpus + 1) // 2 %}
 {% if work_threads > 10 %}
-    set work_threads = 10
+{%  set work_threads = 10 %}
 {% endif %}
 
 <VirtualHost {{ internal_ip }}:80>
diff --git a/deploy/adapters/ansible/openstack_newton_xenial/roles/keystone/templates/wsgi-keystone.conf.j2 b/deploy/adapters/ansible/openstack_newton_xenial/roles/keystone/templates/wsgi-keystone.conf.j2
index f5f9d339..55c89839 100644
--- a/deploy/adapters/ansible/openstack_newton_xenial/roles/keystone/templates/wsgi-keystone.conf.j2
+++ b/deploy/adapters/ansible/openstack_newton_xenial/roles/keystone/templates/wsgi-keystone.conf.j2
@@ -1,6 +1,6 @@
 {% set work_threads = (ansible_processor_vcpus + 1) // 2 %}
 {% if work_threads > 10 %}
-    set work_threads = 10
+{%  set work_threads = 10 %}
 {% endif %}
 
 <VirtualHost {{ internal_ip }}:5000>
-- 
cgit 1.2.3-korg