openstack/openstack-ansible
Code Issues Proposed changes

Merge "Replace host_need_pip with standard override mechanism"

Browse Source
This commit is contained in:
Zuul 2018-02-20 12:37:03 +00:00 committed by Gerrit Code Review
commit a588c7bab4
2 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
playbooks/containers-lxc-create.yml
View File

@ -53,16 +53,17 @@
tags: tags:
- lxc-containers-create - lxc-containers-create
# TODO(evrardjp): Remove host_need_pip in the future - name: Configure containers default software
# when the process building the repo is done before this step.
- name: Configure containers default software, but don't run pip yet
hosts: all_lxc_containers hosts: all_lxc_containers
gather_facts: true gather_facts: true
user: root user: root
pre_tasks:
- include: common-tasks/set-upper-constraints.yml
- include: common-tasks/set-pip-upstream-url.yml
roles: roles:
- role: "openstack_hosts" - role: "openstack_hosts"
vars: vars_files:
host_need_pip: False - defaults/repo_packages/openstack_services.yml
environment: "{{ deployment_environment_variables | default({}) }}" environment: "{{ deployment_environment_variables | default({}) }}"
tags: tags:
- lxc-containers-create - lxc-containers-create

11
playbooks/containers-nspawn-create.yml
View File

@ -41,17 +41,18 @@
tags: tags:
- nspawn-containers-create - nspawn-containers-create
# TODO(evrardjp): Remove host_need_pip in the future - name: Configure containers default software
# when the process building the repo is done before this step.
- name: Configure containers default software, but don't run pip yet
hosts: all_nspawn_containers hosts: all_nspawn_containers
gather_facts: true gather_facts: true
user: root user: root
pre_tasks:
- include: common-tasks/set-upper-constraints.yml
- include: common-tasks/set-pip-upstream-url.yml
roles: roles:
- role: "openstack_hosts" - role: "openstack_hosts"
is_container: true is_container: true
vars: vars_files:
host_need_pip: False - defaults/repo_packages/openstack_services.yml
environment: "{{ deployment_environment_variables | default({}) }}" environment: "{{ deployment_environment_variables | default({}) }}"
tags: tags:
- nspawn-containers-create - nspawn-containers-create