metal: add docs + start using no_containers

We have a feature that allows us to stop using containers for
a specific host inside the openstack_user_config directly.

This patch starts making the metal jobs to use it instead of
using an env.d override which should make the upgrade jobs much
cleaner.

Change-Id: I1b2116b86d1e4d68867111068aaf2d32e7f3a731
This commit is contained in:
Mohammed Naser 2019-07-19 17:13:58 -04:00 committed by Dmitriy Rabotyagov (noonedeadpunk)
parent 21101aaa4d
commit f02554faf2
3 changed files with 22 additions and 7 deletions

View File

@ -66,11 +66,32 @@ the ``is_metal`` property to ``true`` for the container group in the
The use of ``container_vars`` and mapping from container groups to host groups
is the same for a service deployed directly onto the host.
You can also use the ``no_containers`` option to specify a host that will have
all services deployed on metal inside of it.
.. note::
The ``cinder-volume`` component is deployed directly on the host by
default. See the ``env.d/cinder.yml`` file for this example.
Example: Running all controllers on metal
-----------------------------------------
For example, if you'd like to run all your controllers on metal, you would
have the following inside your ``openstack_user_config.yml``.
.. code-block:: yaml
infra_hosts:
infra1:
ip: 172.39.123.11
no_containers: true
infra2:
ip: 172.39.123.12
no_containers: true
infra3:
ip: 172.39.123.13
no_containers: true
Example: Running galera on dedicated hosts
------------------------------------------

View File

@ -35,6 +35,7 @@ global_overrides:
# dynamic inventory testing.
external_lb_vip_address: "{{ bootstrap_host_public_address | default(ansible_default_ipv4.address) }}"
management_bridge: "br-mgmt"
no_containers: {{ true if 'metal' in bootstrap_host_scenarios else false }}
provider_networks:
- network:
container_bridge: "br-mgmt"

View File

@ -190,13 +190,6 @@
when:
- "'ceph' in bootstrap_host_scenarios_expanded"
- name: Copy modified env.d file for metal scenario
copy:
src: "{{ playbook_dir }}/../etc/openstack_deploy/env.d/aio_metal.yml.example"
dest: "/etc/openstack_deploy/env.d/aio_metal.yml"
when:
- "'metal' in bootstrap_host_scenarios"
- name: Copy modified env.d file for calico scenario
copy:
src: "{{ playbook_dir }}/../etc/openstack_deploy/env.d/calico.yml.example"