Run agent config tasks before post_install

The agent config tasks typically prep config directories and install
pip packages, so they should be run before the configs are dropped
or we run into issues dropping agent configs due to nonexisting
directories.

Aside: this also contains an update to the calico and dragonflow
test inventories, which currently always fail because the "openstack1"
container does not exist anymore as per
I672ceb0848415c8f2653ebc8f7556db77f7f001c.

Change-Id: I67f1377b6172558341fcf95eff73775b10c870ca
This commit is contained in:
Logan V 2017-06-28 21:32:16 -05:00
parent 280788b200
commit 5d3f059606
3 changed files with 34 additions and 17 deletions

View File

@ -66,10 +66,6 @@
tags:
- neutron-config
- include: neutron_post_install.yml
tags:
- neutron-config
# Include provider specific config(s)
- include: "{{ item }}"
with_first_found:
@ -81,6 +77,10 @@
tags:
- neutron-install
- include: neutron_post_install.yml
tags:
- neutron-config
- include: "neutron_init_{{ ansible_service_mgr }}.yml"
tags:
- neutron-config

View File

@ -1,14 +1,20 @@
[all]
localhost
infra1
openstack1
server1
server2
agents1
agents2
[physical_host]
localhost
[all_containers]
infra1
openstack1
server1
server2
agents1
agents2
[rabbitmq_all]
infra1
@ -32,13 +38,15 @@ memcached_all
etcd_all
[keystone_all]
openstack1
infra1
[neutron_calico_dhcp_agent]
openstack1
agents1
agents2
[neutron_server]
openstack1
server1
server2
[neutron_agent]
[neutron_dhcp_agent]
@ -62,4 +70,4 @@ neutron_server
neutron_calico_dhcp_agent
[utility_all]
openstack1
infra1

View File

@ -1,14 +1,20 @@
[all]
localhost
infra1
openstack1
server1
server2
agents1
agents2
[physical_host]
localhost
[all_containers]
infra1
openstack1
server1
server2
agents1
agents2
[rabbitmq_all]
infra1
@ -32,19 +38,22 @@ memcached_all
etcd_all
[keystone_all]
openstack1
infra1
[neutron_server]
openstack1
server1
server2
[dragonflow_pubsub_agent]
openstack1
server1
server2
[dragonflow_controller_agent]
localhost
[dragonflow_l3_agent]
openstack1
agents1
agents2
[neutron_agent]
[neutron_dhcp_agent]
@ -70,4 +79,4 @@ dragonflow_pubsub_agent
dragonflow_l3_agent
[utility_all]
openstack1
infra1