Merge "metal: add docs + start using no_containers"

doc/source/reference/inventory/configure-inventory.rst

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

etc/openstack_deploy/openstack_user_config.yml.aio.j2

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

tests/roles/bootstrap-host/tasks/prepare_aio_config.yml

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