From dbb298707a6ee35c5a2d369d4d66a208902c4698 Mon Sep 17 00:00:00 2001 From: Mark Goddard Date: Thu, 30 Nov 2017 18:26:55 +0000 Subject: [PATCH] Remove config-mgmt group, instead use localhost There are places where we assume the control host is localhost, so this group is of little use. --- ansible/bootstrap.yml | 2 +- ansible/dell-compute-node-inventory.yml | 2 +- ansible/kolla-ansible.yml | 2 +- ansible/kolla-bifrost.yml | 2 +- ansible/kolla-openstack.yml | 2 +- ansible/public-openrc.yml | 2 +- doc/source/configuration/kayobe.rst | 3 +-- etc/kayobe/inventory/hosts.example | 1 - 8 files changed, 7 insertions(+), 9 deletions(-) diff --git a/ansible/bootstrap.yml b/ansible/bootstrap.yml index 71718a55f..0699edac1 100644 --- a/ansible/bootstrap.yml +++ b/ansible/bootstrap.yml @@ -1,6 +1,6 @@ --- - name: Ensure configuration management host is bootstrapped - hosts: config-mgmt + hosts: localhost roles: - role: bootstrap bootstrap_ssh_key_type: "{{ ssh_key_type }}" diff --git a/ansible/dell-compute-node-inventory.yml b/ansible/dell-compute-node-inventory.yml index ac3279a6b..bc6f852d5 100644 --- a/ansible/dell-compute-node-inventory.yml +++ b/ansible/dell-compute-node-inventory.yml @@ -1,6 +1,6 @@ --- - name: Ensure Dell baremetal compute nodes are present in the Ansible inventory - hosts: config-mgmt + hosts: localhost gather_facts: no vars: # Set this to a colon-separated list of baremeal compute node hostnames on diff --git a/ansible/kolla-ansible.yml b/ansible/kolla-ansible.yml index 1b734a067..5ef2d76a1 100644 --- a/ansible/kolla-ansible.yml +++ b/ansible/kolla-ansible.yml @@ -1,6 +1,6 @@ --- - name: Ensure Kolla Ansible is configured - hosts: config-mgmt + hosts: localhost vars: # We need to reference configuration for the controller and seed nodes. # We pick the first host from each group for this. It is possible that at diff --git a/ansible/kolla-bifrost.yml b/ansible/kolla-bifrost.yml index dc0ff05c4..b9e5256b2 100644 --- a/ansible/kolla-bifrost.yml +++ b/ansible/kolla-bifrost.yml @@ -1,6 +1,6 @@ --- - name: Ensure Kolla Bifrost is configured - hosts: config-mgmt + hosts: localhost vars: kolla_bifrost_extra_globals_path: "{{ kayobe_config_path ~ '/kolla/config/bifrost/bifrost.yml' }}" kolla_bifrost_driver_map: diff --git a/ansible/kolla-openstack.yml b/ansible/kolla-openstack.yml index a0ad4c331..ef1b40401 100644 --- a/ansible/kolla-openstack.yml +++ b/ansible/kolla-openstack.yml @@ -72,7 +72,7 @@ - config - name: Ensure Kolla OpenStack components are configured - hosts: config-mgmt + hosts: localhost vars: switch_type_to_device_type: dellos9: netmiko_dell_force10 diff --git a/ansible/public-openrc.yml b/ansible/public-openrc.yml index 6934a1810..292e839ca 100644 --- a/ansible/public-openrc.yml +++ b/ansible/public-openrc.yml @@ -3,7 +3,7 @@ # as the admin user in the admin project. - name: Ensure a public OpenStack API environment file exists - hosts: config-mgmt + hosts: localhost vars: public_api_proto: "{% if kolla_enable_tls_external | bool %}https{% else %}http{% endif %}" public_api_vip_address: "{{ public_net_name | net_vip_address }}" diff --git a/doc/source/configuration/kayobe.rst b/doc/source/configuration/kayobe.rst index 148f576b5..da974e861 100644 --- a/doc/source/configuration/kayobe.rst +++ b/doc/source/configuration/kayobe.rst @@ -82,8 +82,7 @@ Inventory The inventory should contain the following hosts: Control host - This should be localhost and should be a member of the ``config-mgmt`` - group. + This should be localhost. Seed hypervisor If provisioning a seed VM, a host should exist for the hypervisor that will run the VM, and should be a member of the ``seed-hypervisor`` group. diff --git a/etc/kayobe/inventory/hosts.example b/etc/kayobe/inventory/hosts.example index 1cce1ce29..9d107ec91 100644 --- a/etc/kayobe/inventory/hosts.example +++ b/etc/kayobe/inventory/hosts.example @@ -1,7 +1,6 @@ # Kayobe hosts inventory file. This file should be modified to define the hosts # and their top-level group membership. -[config-mgmt] # This host acts as the configuration management control host. This must be # localhost. localhost ansible_connection=local