Adapt to openstack_hosts/pip_install changes

The commit [1] introduced a change in the openstack_hosts role,
allowing it to be aware of group_vars/host_vars.

We therefore don't need the group matching in the variable
``openstack_host_specific_kernel_modules``.

On top of that, the commit [2] allowed repo management for all
hosts where openstack_hosts is applied, and commit [3] removed
UCA from pip install, which applies to all the hosts,
whether they are containers or not.
We should therefore add UCA to containers back.

[1]: https://review.openstack.org/#/c/515397
[2]: https://review.openstack.org/#/c/515399
[3]: https://review.openstack.org/#/c/515400/

Change-Id: Ic959a42f7c6fb33b80e646b6689fc2d54f4f9ac8
This commit is contained in:
Jean-Philippe Evrard 2017-10-26 14:16:12 +01:00
parent d784bea5ec
commit 2a8aab45b3
3 changed files with 15 additions and 7 deletions

View File

@ -49,13 +49,6 @@ repo_pkg_cache_port: 3142
repo_pkg_cache_url: "http://{{ internal_lb_vip_address }}:{{ repo_pkg_cache_port }}"
repo_release_path: "{{ openstack_repo_url }}/os-releases/{{ openstack_release }}/{{ os_distro_version }}"
## kernel modules for specific group hosts
# :param name: name of the kernel module
# :param pattern: pattern to search for in /boot/config-$kernel_version to check how module is configured inside kernel
# :param group: group of hosts where the module will be loaded
openstack_host_specific_kernel_modules:
- { name: "ebtables", pattern: "CONFIG_BRIDGE_NF_EBTABLES", group: "network_hosts" }
## DNS resolution (resolvconf) options
#Group containing resolvers to configure
resolvconf_resolver_group: unbound

View File

@ -0,0 +1,3 @@
openstack_host_specific_kernel_modules:
- name: "ebtables"
pattern: "CONFIG_BRIDGE_NF_EBTABLES"

View File

@ -40,3 +40,15 @@
environment: "{{ deployment_environment_variables | default({}) }}"
tags:
- lxc-containers-create
- name: Configure containers default software
hosts: "{{ container_group|default('all_containers') }}"
gather_facts: true
user: root
roles:
- role: "openstack_hosts"
vars:
is_metal: "{{ properties.is_metal|default(false) }}"
environment: "{{ deployment_environment_variables | default({}) }}"
tags:
- lxc-containers-create