From: liyuenan <liyuenan@huawei.com>
Date: Mon, 28 Nov 2016 05:20:23 +0000 (+0800)
Subject: Fix some xenial baremetal deploy bugs
X-Git-Tag: Danube.0.1~12
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F69%2F24969%2F2;p=compass4nfv.git

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>
---

diff --git a/deploy/adapters/ansible/openstack_mitaka_xenial/roles/dashboard/templates/openstack-dashboard.conf.j2 b/deploy/adapters/ansible/openstack_mitaka_xenial/roles/dashboard/templates/openstack-dashboard.conf.j2
index 89a70686..664af687 100755
--- a/deploy/adapters/ansible/openstack_mitaka_xenial/roles/dashboard/templates/openstack-dashboard.conf.j2
+++ b/deploy/adapters/ansible/openstack_mitaka_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_mitaka_xenial/roles/keystone/templates/wsgi-keystone.conf.j2 b/deploy/adapters/ansible/openstack_mitaka_xenial/roles/keystone/templates/wsgi-keystone.conf.j2
index f5f9d339..55c89839 100644
--- a/deploy/adapters/ansible/openstack_mitaka_xenial/roles/keystone/templates/wsgi-keystone.conf.j2
+++ b/deploy/adapters/ansible/openstack_mitaka_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>
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>
diff --git a/deploy/adapters/ansible/roles/common/tasks/main.yml b/deploy/adapters/ansible/roles/common/tasks/main.yml
index 8da5603c..1fa0de84 100644
--- a/deploy/adapters/ansible/roles/common/tasks/main.yml
+++ b/deploy/adapters/ansible/roles/common/tasks/main.yml
@@ -46,15 +46,15 @@
 - name: make config template dir exist
   file: path=/opt/os_templates state=directory mode=0755
 
-- name: upgrade pip
-  pip: name=pip state=latest
-
 - name: create pip config directory
   file: path=~/.pip state=directory
 
 - name: update pip.conf
   template: src=pip.conf dest=~/.pip/{{ pip_conf }}
 
+- name: upgrade pip
+  pip: name=pip state=latest
+
 - name: install pip packages
   pip: name={{ item }} state=present extra_args='--pre'
   with_items: pip_packages