From 1f371e2717e52973ad3df904742adffe904fe440 Mon Sep 17 00:00:00 2001 From: SamYaple Date: Thu, 17 Mar 2016 15:30:17 +0000 Subject: [PATCH] Allow per node configuration with augments This type of per node configuration is required to support things like availability zones for nova. As always, if this file doesnt exist it doesnt get used so this change is safe. TrivialFix Change-Id: Iff8172af522c2c96e5f2c173b24a5dfd4d522ed2 --- ansible/roles/ceph/tasks/config.yml | 1 + ansible/roles/cinder/tasks/config.yml | 1 + ansible/roles/glance/tasks/config.yml | 1 + ansible/roles/heat/tasks/config.yml | 1 + ansible/roles/ironic/tasks/config.yml | 1 + ansible/roles/keystone/tasks/config.yml | 1 + ansible/roles/magnum/tasks/config.yml | 1 + ansible/roles/manila/tasks/config.yml | 1 + ansible/roles/mariadb/tasks/config.yml | 1 + ansible/roles/mistral/tasks/config.yml | 1 + ansible/roles/murano/tasks/config.yml | 1 + ansible/roles/neutron/tasks/config-neutron-fake.yml | 2 ++ ansible/roles/neutron/tasks/config.yml | 2 ++ ansible/roles/nova/tasks/config-nova-fake.yml | 1 + ansible/roles/nova/tasks/config.yml | 1 + ansible/roles/swift/tasks/config.yml | 5 +++++ 16 files changed, 22 insertions(+) diff --git a/ansible/roles/ceph/tasks/config.yml b/ansible/roles/ceph/tasks/config.yml index 21ae654b9d..6dc826030c 100644 --- a/ansible/roles/ceph/tasks/config.yml +++ b/ansible/roles/ceph/tasks/config.yml @@ -25,6 +25,7 @@ sources: - "{{ role_path }}/templates/ceph.conf.j2" - "/etc/kolla/config/ceph.conf" + - "/etc/kolla/config/ceph/{{ inventory_hostname }}/ceph.conf" dest: "{{ node_config_directory }}/{{ item }}/ceph.conf" with_items: - "ceph-mon" diff --git a/ansible/roles/cinder/tasks/config.yml b/ansible/roles/cinder/tasks/config.yml index 5c6e8305e1..8adcfc850a 100644 --- a/ansible/roles/cinder/tasks/config.yml +++ b/ansible/roles/cinder/tasks/config.yml @@ -31,6 +31,7 @@ - "/etc/kolla/config/messaging.conf" - "/etc/kolla/config/cinder.conf" - "/etc/kolla/config/cinder/{{ item }}.conf" + - "/etc/kolla/config/cinder/{{ inventory_hostname }}/cinder.conf" dest: "{{ node_config_directory }}/{{ item }}/cinder.conf" with_items: - "cinder-api" diff --git a/ansible/roles/glance/tasks/config.yml b/ansible/roles/glance/tasks/config.yml index ed8cb57b07..916cac84d8 100644 --- a/ansible/roles/glance/tasks/config.yml +++ b/ansible/roles/glance/tasks/config.yml @@ -27,6 +27,7 @@ - "/etc/kolla/config/messaging.conf" - "/etc/kolla/config/glance.conf" - "/etc/kolla/config/glance/{{ item }}.conf" + - "/etc/kolla/config/glance/{{ inventory_hostname }}/{{ item }}.conf" dest: "{{ node_config_directory }}/{{ item }}/{{ item }}.conf" with_items: - "glance-api" diff --git a/ansible/roles/heat/tasks/config.yml b/ansible/roles/heat/tasks/config.yml index 543598694a..0bb0c4139d 100644 --- a/ansible/roles/heat/tasks/config.yml +++ b/ansible/roles/heat/tasks/config.yml @@ -29,6 +29,7 @@ - "/etc/kolla/config/messaging.conf" - "/etc/kolla/config/heat.conf" - "/etc/kolla/config/heat/{{ item }}.conf" + - "/etc/kolla/config/heat/{{ inventory_hostname }}/heat.conf" dest: "{{ node_config_directory }}/{{ item }}/heat.conf" with_items: - "heat-api" diff --git a/ansible/roles/ironic/tasks/config.yml b/ansible/roles/ironic/tasks/config.yml index d4d3e6bd8a..b793a69c79 100644 --- a/ansible/roles/ironic/tasks/config.yml +++ b/ansible/roles/ironic/tasks/config.yml @@ -31,6 +31,7 @@ - "/etc/kolla/config/messaging.conf" - "/etc/kolla/config/ironic.conf" - "/etc/kolla/config/ironic/{{ item }}.conf" + - "/etc/kolla/config/ironic/{{ inventory_hostname }}/ironic.conf" dest: "{{ node_config_directory }}/{{ item }}/ironic.conf" with_items: - "ironic-api" diff --git a/ansible/roles/keystone/tasks/config.yml b/ansible/roles/keystone/tasks/config.yml index 7cd81b0e1e..bdfe606ec0 100644 --- a/ansible/roles/keystone/tasks/config.yml +++ b/ansible/roles/keystone/tasks/config.yml @@ -24,6 +24,7 @@ - "/etc/kolla/config/database.conf" - "/etc/kolla/config/messaging.conf" - "/etc/kolla/config/keystone.conf" + - "/etc/kolla/config/keystone/{{ inventory_hostname }}/keystone.conf" dest: "{{ node_config_directory }}/{{ item }}/keystone.conf" with_items: - "keystone" diff --git a/ansible/roles/magnum/tasks/config.yml b/ansible/roles/magnum/tasks/config.yml index a682766a59..bae6f4ef62 100644 --- a/ansible/roles/magnum/tasks/config.yml +++ b/ansible/roles/magnum/tasks/config.yml @@ -27,6 +27,7 @@ - "/etc/kolla/config/messaging.conf" - "/etc/kolla/config/magnum.conf" - "/etc/kolla/config/magnum/{{ item }}.conf" + - "/etc/kolla/config/magnum/{{ inventory_hostname }}/magnum.conf" dest: "{{ node_config_directory }}/{{ item }}/magnum.conf" with_items: - "magnum-api" diff --git a/ansible/roles/manila/tasks/config.yml b/ansible/roles/manila/tasks/config.yml index 169350cf7e..b13a2c601d 100644 --- a/ansible/roles/manila/tasks/config.yml +++ b/ansible/roles/manila/tasks/config.yml @@ -29,6 +29,7 @@ - "/etc/kolla/config/messaging.conf" - "/etc/kolla/config/manila.conf" - "/etc/kolla/config/manila/{{ item }}.conf" + - "/etc/kolla/config/manila/{{ inventory_hostname }}/manila.conf" dest: "{{ node_config_directory }}/{{ item }}/manila.conf" with_items: - "manila-api" diff --git a/ansible/roles/mariadb/tasks/config.yml b/ansible/roles/mariadb/tasks/config.yml index 23e48f66f5..5c8cbd0ca5 100644 --- a/ansible/roles/mariadb/tasks/config.yml +++ b/ansible/roles/mariadb/tasks/config.yml @@ -21,6 +21,7 @@ sources: - "{{ role_path }}/templates/galera.cnf.j2" - "/etc/kolla/config/galera.cnf" + - "/etc/kolla/config/mariadb/{{ inventory_hostname }}/galera.cnf" dest: "{{ node_config_directory }}/{{ item }}/galera.cnf" with_items: - "mariadb" diff --git a/ansible/roles/mistral/tasks/config.yml b/ansible/roles/mistral/tasks/config.yml index fc8f8d2c6c..5901e64826 100644 --- a/ansible/roles/mistral/tasks/config.yml +++ b/ansible/roles/mistral/tasks/config.yml @@ -29,6 +29,7 @@ - "/etc/kolla/config/messaging.conf" - "/etc/kolla/config/mistral.conf" - "/etc/kolla/config/mistral/{{ item }}.conf" + - "/etc/kolla/config/mistral/{{ inventory_hostname }}/mistral.conf" dest: "{{ node_config_directory }}/{{ item }}/mistral.conf" with_items: - "mistral-api" diff --git a/ansible/roles/murano/tasks/config.yml b/ansible/roles/murano/tasks/config.yml index edb848f103..9202c57d8f 100644 --- a/ansible/roles/murano/tasks/config.yml +++ b/ansible/roles/murano/tasks/config.yml @@ -27,6 +27,7 @@ - "/etc/kolla/config/messaging.conf" - "/etc/kolla/config/murano.conf" - "/etc/kolla/config/murano/{{ item }}.conf" + - "/etc/kolla/config/murano/{{ inventory_hostname }}/murano.conf" dest: "{{ node_config_directory }}/{{ item }}/murano.conf" with_items: - "murano-api" diff --git a/ansible/roles/neutron/tasks/config-neutron-fake.yml b/ansible/roles/neutron/tasks/config-neutron-fake.yml index 3653a6032a..e8bd8833aa 100644 --- a/ansible/roles/neutron/tasks/config-neutron-fake.yml +++ b/ansible/roles/neutron/tasks/config-neutron-fake.yml @@ -25,6 +25,7 @@ - "/etc/kolla/config/messaging.conf" - "/etc/kolla/config/neutron.conf" - "/etc/kolla/config/neutron/{{ item }}.conf" + - "/etc/kolla/config/neutron/{{ inventory_hostname }}/neutron.conf" dest: "{{ node_config_directory }}/neutron-openvswitch-agent-fake-{{ item }}/neutron.conf" with_sequence: start=1 end={{ num_nova_fake_per_node }} when: @@ -36,6 +37,7 @@ sources: - "{{ role_path }}/templates/ml2_conf.ini.j2" - "/etc/kolla/config/neutron/ml2_conf.ini" + - "/etc/kolla/config/neutron/{{ inventory_hostname }}/neutron.conf" dest: "{{ node_config_directory }}/neutron-openvswitch-agent-fake-{{ item }}/ml2_conf.ini" with_sequence: start=1 end={{ num_nova_fake_per_node }} when: diff --git a/ansible/roles/neutron/tasks/config.yml b/ansible/roles/neutron/tasks/config.yml index 8f7d6d5e96..d0ed51d484 100644 --- a/ansible/roles/neutron/tasks/config.yml +++ b/ansible/roles/neutron/tasks/config.yml @@ -49,6 +49,7 @@ - "/etc/kolla/config/messaging.conf" - "/etc/kolla/config/neutron.conf" - "/etc/kolla/config/neutron/{{ item }}.conf" + - "/etc/kolla/config/neutron/{{ inventory_hostname }}/neutron.conf" dest: "{{ node_config_directory }}/{{ item }}/neutron.conf" with_items: - "neutron-dhcp-agent" @@ -65,6 +66,7 @@ sources: - "{{ role_path }}/templates/ml2_conf.ini.j2" - "/etc/kolla/config/neutron/ml2_conf.ini" + - "/etc/kolla/config/neutron/{{ inventory_hostname }}/neutron.conf" dest: "{{ node_config_directory }}/{{ item }}/ml2_conf.ini" with_items: - "neutron-dhcp-agent" diff --git a/ansible/roles/nova/tasks/config-nova-fake.yml b/ansible/roles/nova/tasks/config-nova-fake.yml index 77311b74d0..70e109a23e 100644 --- a/ansible/roles/nova/tasks/config-nova-fake.yml +++ b/ansible/roles/nova/tasks/config-nova-fake.yml @@ -23,5 +23,6 @@ - "/etc/kolla/config/messaging.conf" - "/etc/kolla/config/nova.conf" - "/etc/kolla/config/nova/{{ item }}.conf" + - "/etc/kolla/config/nova/{{ inventory_hostname }}/nova.conf" dest: "{{ node_config_directory }}/nova-compute-fake-{{ item }}/nova.conf" with_sequence: start=1 end={{ num_nova_fake_per_node }} diff --git a/ansible/roles/nova/tasks/config.yml b/ansible/roles/nova/tasks/config.yml index cf701f8e17..bd83120c22 100644 --- a/ansible/roles/nova/tasks/config.yml +++ b/ansible/roles/nova/tasks/config.yml @@ -52,6 +52,7 @@ - "/etc/kolla/config/messaging.conf" - "/etc/kolla/config/nova.conf" - "/etc/kolla/config/nova/{{ item }}.conf" + - "/etc/kolla/config/nova/{{ inventory_hostname }}/nova.conf" dest: "{{ node_config_directory }}/{{ item }}/nova.conf" with_items: - "nova-api" diff --git a/ansible/roles/swift/tasks/config.yml b/ansible/roles/swift/tasks/config.yml index b5cfbf7e51..46efe7d45d 100644 --- a/ansible/roles/swift/tasks/config.yml +++ b/ansible/roles/swift/tasks/config.yml @@ -52,6 +52,7 @@ - "/etc/kolla/config/global.conf" - "/etc/kolla/config/swift.conf" - "/etc/kolla/config/swift/{{ item }}.conf" + - "/etc/kolla/config/swift/{{ inventory_hostname }}/{{ item }}.conf" dest: "{{ node_config_directory }}/swift-{{ item }}/swift.conf" with_items: - "account-auditor" @@ -78,6 +79,7 @@ - "/etc/kolla/config/global.conf" - "/etc/kolla/config/swift/account.conf" - "/etc/kolla/config/swift/{{ item }}.conf" + - "/etc/kolla/config/swift/{{ inventory_hostname }}/{{ item }}.conf" dest: "{{ node_config_directory }}/swift-{{ item }}/{{ item }}.conf" with_items: - "account-auditor" @@ -94,6 +96,7 @@ - "/etc/kolla/config/global.conf" - "/etc/kolla/config/swift/container.conf" - "/etc/kolla/config/swift/{{ item }}.conf" + - "/etc/kolla/config/swift/{{ inventory_hostname }}/{{ item }}.conf" dest: "{{ node_config_directory }}/swift-{{ item }}/{{ item }}.conf" with_items: - "container-auditor" @@ -110,6 +113,7 @@ - "/etc/kolla/config/global.conf" - "/etc/kolla/config/swift/object.conf" - "/etc/kolla/config/swift/{{ item }}.conf" + - "/etc/kolla/config/swift/{{ inventory_hostname }}/{{ item }}.conf" dest: "{{ node_config_directory }}/swift-{{ item }}/{{ item }}.conf" with_items: - "object-auditor" @@ -126,6 +130,7 @@ - "{{ role_path }}/templates/proxy-server.conf.j2" - "/etc/kolla/config/global.conf" - "/etc/kolla/config/swift/{{ item }}.conf" + - "/etc/kolla/config/swift/{{ inventory_hostname }}/{{ item }}.conf" dest: "{{ node_config_directory }}/swift-{{ item }}/{{ item }}.conf" with_items: - "proxy-server"