In order to deploy projectcalico in openstack, I no longer need neutron agents containers as the compute nodes handle their own networking. On the compute node the only neutron service I need is neutron_dhcp_agent. So I made the obvious change to env.d:
belongs_to:
- compute_containers
contains:
- - neutron_linuxbridge_agent
+ - neutron_dhcp_agent
+ - nova_api_metadata
- nova_compute
properties:
is_metal: true
This did not result in a neutron_dhcp_agent service being configured in the compute node, because the tasks are set up in a way that every neutron service besides neutron_linuxbridge_agent must be deployed inside the neutron_agents container.
The following change I am testing allows neutron services to be deployed whereever the environment determines they must be.
diff --git a/playbooks/roles/os_neutron/tasks/neutron_post_install.yml b/playbooks/roles/os_neutron/tasks/neutron_post_install.yml
index 381fa0b..efa8b15 100644
--- a/playbooks/roles/os_neutron/tasks/neutron_post_install.yml
+++ b/playbooks/roles/os_neutron/tasks/neutron_post_install.yml
@@ -60,7 +60,7 @@
notify:
- Restart neutron services
when: >
- inventory_hostname in groups['neutron_agents_container']
+ inventory_hostname in groups['neutron_dhcp_agent']
tags:
- neutron-config
@@ -79,7 +79,7 @@
when:
- item.value.service_en | bool
- item.value.service_conf is defined
- - inventory_hostname in groups['neutron_agents_container']
+ - inventory_hostname in "{{ groups[ item.value.service_name|replace('-', '_') ]}}"
tags:
- neutron-config
diff --git a/playbooks/roles/os_neutron/tasks/neutron_upstart_init.yml b/playbooks/roles/os_neutron/tasks/neutron_upstart_init.yml
index da27dda..68df14f 100644
--- a/playbooks/roles/os_neutron/tasks/neutron_upstart_init.yml
+++ b/playbooks/roles/os_neutron/tasks/neutron_upstart_init.yml
@@ -36,7 +36,7 @@
system_group: "{{ neutron_system_group_name }}"
service_home: "{{ neutron_system_home_folder }}"
when:
- - inventory_hostname in groups['neutron_agent']
+ - inventory_hostname in groups['neutron_dhcp_agent']
- neutron_services['neutron-dhcp-agent'].service_en | bool
tags:
- upstart-init
@@ -50,7 +50,7 @@
system_group: "{{ neutron_system_group_name }}"
service_home: "{{ neutron_system_home_folder }}"
when:
- - inventory_hostname in groups['neutron_agent']
+ - inventory_hostname in groups['neutron_l3_agent']
- neutron_services['neutron-l3-agent'].service_en | bool
tags:
- upstart-init
@@ -78,7 +78,7 @@
system_group: "{{ neutron_system_group_name }}"
service_home: "{{ neutron_system_home_folder }}"
when:
- - inventory_hostname in groups['neutron_agent']
+ - inventory_hostname in groups['neutron_metadata_agent']
- neutron_services['neutron-metadata-agent'].service_en | bool
tags:
- upstart-init
@@ -92,7 +92,7 @@
system_group: "{{ neutron_system_group_name }}"
service_home: "{{ neutron_system_home_folder }}"
when:
- - inventory_hostname in groups['neutron_agent']
+ - inventory_hostname in groups['neutron_metering_agent']
- neutron_services['neutron-metering-agent'].service_en | bool
tags:
- upstart-init
After making this change I have a neutron_dhcp_agent deploying to my compute node as expected.
Hi @Logan,
The change you have in the diff looks sensible for general consumption. Might you have an change to post that up for review so that we get some core reviewer eyes on it and potentially in upstream?
If you need help getting started with the general OpenStack commit process let us know in the channel we'd be happy to help. In the meantime, thank you for the diff (patch) and I look forward to seeing it as a review in the future.