Use kolla variable to set inspector DHCP config
Fixes an issue with ironic prechecks, which now require ironic_dnsmasq_dhcp_range to be set when ironic is enabled. Also uses the new kolla variable ironic_dnsmasq_default_gateway to configure the gateway for the inspection network. These changes mean that we can drop our custom override of ironic-dnsmasq.conf, since it now matches the file in kolla ansible. This change depends on the Rocky release of Kolla Ansible. Change-Id: I0b2e094904772fc6e14f1916e20ef207161ec001
Showing
- ansible/kolla-ansible.yml 3 additions, 0 deletionsansible/kolla-ansible.yml
- ansible/kolla-openstack.yml 0 additions, 6 deletionsansible/kolla-openstack.yml
- ansible/roles/kolla-ansible/defaults/main.yml 11 additions, 0 deletionsansible/roles/kolla-ansible/defaults/main.yml
- ansible/roles/kolla-ansible/templates/globals.yml.j2 6 additions, 1 deletionansible/roles/kolla-ansible/templates/globals.yml.j2
- ansible/roles/kolla-ansible/tests/test-defaults.yml 2 additions, 0 deletionsansible/roles/kolla-ansible/tests/test-defaults.yml
- ansible/roles/kolla-ansible/tests/test-extras.yml 5 additions, 0 deletionsansible/roles/kolla-ansible/tests/test-extras.yml
- ansible/roles/kolla-openstack/defaults/main.yml 0 additions, 15 deletionsansible/roles/kolla-openstack/defaults/main.yml
- ansible/roles/kolla-openstack/molecule/enable-everything/molecule.yml 0 additions, 2 deletions...s/kolla-openstack/molecule/enable-everything/molecule.yml
- ansible/roles/kolla-openstack/molecule/enable-everything/tests/test_default.py 0 additions, 1 deletion...penstack/molecule/enable-everything/tests/test_default.py
- ansible/roles/kolla-openstack/tasks/config.yml 0 additions, 1 deletionansible/roles/kolla-openstack/tasks/config.yml
- ansible/roles/kolla-openstack/templates/ironic-dnsmasq.conf.j2 0 additions, 37 deletions...le/roles/kolla-openstack/templates/ironic-dnsmasq.conf.j2
- ansible/roles/kolla-openstack/vars/main.yml 0 additions, 1 deletionansible/roles/kolla-openstack/vars/main.yml
Loading
Please register or sign in to comment