diff options
| author |   liyuenan <liyuenan@huawei.com> | 2016-11-28 13:20:23 +0800 |
|---|---|---|
| committer | liyuenan <liyuenan@huawei.com> | 2016-11-28 14:12:44 +0800 |
| commit | a8614e961d4e600f6fbbac23e4c1a279dd1b186a (patch) | |
| tree | fabab8adfe318ccbdd02d5a6efe7f91244f77053 /deploy | |
| parent | 55a61f037dd6c089f734c4cd53af072562b7fc51 (diff) | |
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>
Diffstat (limited to 'deploy')
6 files changed, 8 insertions, 8 deletions
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 |