Use unified vars in task
Ansible task support vars directive, no need implement another one in merge_config. This patch remove the vars directive in merge_config action plugin. Change-Id: I33648a2b6e39b4d49ce76eb66fbf2522721f8c68
This commit is contained in:
parent
b39e84a23b
commit
03e1b05f99
@ -98,8 +98,6 @@ class ActionModule(action.ActionBase):
|
|||||||
|
|
||||||
def run(self, tmp=None, task_vars=None):
|
def run(self, tmp=None, task_vars=None):
|
||||||
|
|
||||||
if task_vars is None:
|
|
||||||
task_vars = dict()
|
|
||||||
result = super(ActionModule, self).run(tmp, task_vars)
|
result = super(ActionModule, self).run(tmp, task_vars)
|
||||||
|
|
||||||
# NOTE(jeffrey4l): Ansible 2.1 add a remote_user param to the
|
# NOTE(jeffrey4l): Ansible 2.1 add a remote_user param to the
|
||||||
@ -114,22 +112,15 @@ class ActionModule(action.ActionBase):
|
|||||||
tmp = self._make_tmp_path(remote_user)
|
tmp = self._make_tmp_path(remote_user)
|
||||||
|
|
||||||
sources = self._task.args.get('sources', None)
|
sources = self._task.args.get('sources', None)
|
||||||
extra_vars = self._task.args.get('vars', list())
|
|
||||||
|
|
||||||
if not isinstance(sources, list):
|
if not isinstance(sources, list):
|
||||||
sources = [sources]
|
sources = [sources]
|
||||||
|
|
||||||
temp_vars = task_vars.copy()
|
|
||||||
temp_vars.update(extra_vars)
|
|
||||||
|
|
||||||
config = OverrideConfigParser()
|
config = OverrideConfigParser()
|
||||||
old_vars = self._templar._available_variables
|
|
||||||
self._templar.set_available_variables(temp_vars)
|
|
||||||
|
|
||||||
for source in sources:
|
for source in sources:
|
||||||
self.read_config(source, config)
|
self.read_config(source, config)
|
||||||
|
|
||||||
self._templar.set_available_variables(old_vars)
|
|
||||||
# Dump configparser to string via an emulated file
|
# Dump configparser to string via an emulated file
|
||||||
|
|
||||||
fakefile = StringIO()
|
fakefile = StringIO()
|
||||||
@ -140,7 +131,6 @@ class ActionModule(action.ActionBase):
|
|||||||
fakefile.close()
|
fakefile.close()
|
||||||
|
|
||||||
new_module_args = self._task.args.copy()
|
new_module_args = self._task.args.copy()
|
||||||
new_module_args.pop('vars', None)
|
|
||||||
new_module_args.pop('sources', None)
|
new_module_args.pop('sources', None)
|
||||||
|
|
||||||
new_module_args.update(
|
new_module_args.update(
|
||||||
|
@ -25,9 +25,9 @@
|
|||||||
- Restart aodh-notifier container
|
- Restart aodh-notifier container
|
||||||
|
|
||||||
- name: Copying over aodh.conf
|
- name: Copying over aodh.conf
|
||||||
merge_configs:
|
|
||||||
vars:
|
vars:
|
||||||
service_name: "{{ item.key }}"
|
service_name: "{{ item.key }}"
|
||||||
|
merge_configs:
|
||||||
sources:
|
sources:
|
||||||
- "{{ role_path }}/templates/aodh.conf.j2"
|
- "{{ role_path }}/templates/aodh.conf.j2"
|
||||||
- "{{ node_custom_config }}/global.conf"
|
- "{{ node_custom_config }}/global.conf"
|
||||||
|
@ -54,9 +54,9 @@
|
|||||||
- Restart barbican-api container
|
- Restart barbican-api container
|
||||||
|
|
||||||
- name: Copying over barbican.conf
|
- name: Copying over barbican.conf
|
||||||
merge_configs:
|
|
||||||
vars:
|
vars:
|
||||||
service_name: "{{ item.key }}"
|
service_name: "{{ item.key }}"
|
||||||
|
merge_configs:
|
||||||
sources:
|
sources:
|
||||||
- "{{ role_path }}/templates/barbican.conf.j2"
|
- "{{ role_path }}/templates/barbican.conf.j2"
|
||||||
- "{{ node_custom_config }}/global.conf"
|
- "{{ node_custom_config }}/global.conf"
|
||||||
|
@ -43,9 +43,9 @@
|
|||||||
- Restart ceilometer-api container
|
- Restart ceilometer-api container
|
||||||
|
|
||||||
- name: Copying over ceilometer.conf
|
- name: Copying over ceilometer.conf
|
||||||
merge_configs:
|
|
||||||
vars:
|
vars:
|
||||||
service_name: "{{ item.key }}"
|
service_name: "{{ item.key }}"
|
||||||
|
merge_configs:
|
||||||
sources:
|
sources:
|
||||||
- "{{ role_path }}/templates/ceilometer.conf.j2"
|
- "{{ role_path }}/templates/ceilometer.conf.j2"
|
||||||
- "{{ node_custom_config }}/global.conf"
|
- "{{ node_custom_config }}/global.conf"
|
||||||
|
@ -19,9 +19,9 @@
|
|||||||
- "ceph-rgw"
|
- "ceph-rgw"
|
||||||
|
|
||||||
- name: Copying over ceph.conf
|
- name: Copying over ceph.conf
|
||||||
merge_configs:
|
|
||||||
vars:
|
vars:
|
||||||
service_name: "{{ item }}"
|
service_name: "{{ item }}"
|
||||||
|
merge_configs:
|
||||||
sources:
|
sources:
|
||||||
- "{{ role_path }}/templates/ceph.conf.j2"
|
- "{{ role_path }}/templates/ceph.conf.j2"
|
||||||
- "{{ node_custom_config }}/ceph.conf"
|
- "{{ node_custom_config }}/ceph.conf"
|
||||||
|
@ -9,9 +9,9 @@
|
|||||||
when: inventory_hostname in groups['cinder-volume']
|
when: inventory_hostname in groups['cinder-volume']
|
||||||
|
|
||||||
- name: Copying over ceph.conf(s)
|
- name: Copying over ceph.conf(s)
|
||||||
merge_configs:
|
|
||||||
vars:
|
vars:
|
||||||
service_name: "{{ item }}"
|
service_name: "{{ item }}"
|
||||||
|
merge_configs:
|
||||||
sources:
|
sources:
|
||||||
- "{{ role_path }}/../ceph/templates/ceph.conf.j2"
|
- "{{ role_path }}/../ceph/templates/ceph.conf.j2"
|
||||||
- "{{ node_custom_config }}/ceph.conf"
|
- "{{ node_custom_config }}/ceph.conf"
|
||||||
|
@ -44,9 +44,9 @@
|
|||||||
- Restart cinder-api container
|
- Restart cinder-api container
|
||||||
|
|
||||||
- name: Copying over cinder.conf
|
- name: Copying over cinder.conf
|
||||||
merge_configs:
|
|
||||||
vars:
|
vars:
|
||||||
service_name: "{{ item.key }}"
|
service_name: "{{ item.key }}"
|
||||||
|
merge_configs:
|
||||||
sources:
|
sources:
|
||||||
- "{{ role_path }}/templates/cinder.conf.j2"
|
- "{{ role_path }}/templates/cinder.conf.j2"
|
||||||
- "{{ node_custom_config }}/global.conf"
|
- "{{ node_custom_config }}/global.conf"
|
||||||
|
@ -10,9 +10,9 @@
|
|||||||
- backup
|
- backup
|
||||||
|
|
||||||
- name: Copying over ceph.conf for Cinder
|
- name: Copying over ceph.conf for Cinder
|
||||||
merge_configs:
|
|
||||||
vars:
|
vars:
|
||||||
service_name: "{{ item }}"
|
service_name: "{{ item }}"
|
||||||
|
merge_configs:
|
||||||
sources:
|
sources:
|
||||||
- "{{ node_custom_config }}/cinder/ceph.conf"
|
- "{{ node_custom_config }}/cinder/ceph.conf"
|
||||||
- "{{ node_custom_config }}/cinder/{{ item }}/ceph.conf"
|
- "{{ node_custom_config }}/cinder/{{ item }}/ceph.conf"
|
||||||
|
@ -23,9 +23,9 @@
|
|||||||
- Restart cloudkitty-processor container
|
- Restart cloudkitty-processor container
|
||||||
|
|
||||||
- name: Copying over cloudkitty.conf
|
- name: Copying over cloudkitty.conf
|
||||||
merge_configs:
|
|
||||||
vars:
|
vars:
|
||||||
service_name: "{{ item.key }}"
|
service_name: "{{ item.key }}"
|
||||||
|
merge_configs:
|
||||||
sources:
|
sources:
|
||||||
- "{{ role_path }}/templates/cloudkitty.conf.j2"
|
- "{{ role_path }}/templates/cloudkitty.conf.j2"
|
||||||
- "{{ node_custom_config }}/global.conf"
|
- "{{ node_custom_config }}/global.conf"
|
||||||
|
@ -20,9 +20,9 @@
|
|||||||
- "Restart {{ item.key }} container"
|
- "Restart {{ item.key }} container"
|
||||||
|
|
||||||
- name: Copying over congress.conf
|
- name: Copying over congress.conf
|
||||||
merge_configs:
|
|
||||||
vars:
|
vars:
|
||||||
service_name: "{{ item.key }}"
|
service_name: "{{ item.key }}"
|
||||||
|
merge_configs:
|
||||||
sources:
|
sources:
|
||||||
- "{{ role_path }}/templates/congress.conf.j2"
|
- "{{ role_path }}/templates/congress.conf.j2"
|
||||||
- "{{ node_custom_config }}/global.conf"
|
- "{{ node_custom_config }}/global.conf"
|
||||||
|
@ -27,9 +27,9 @@
|
|||||||
- Restart designate-worker container
|
- Restart designate-worker container
|
||||||
|
|
||||||
- name: Copying over designate.conf
|
- name: Copying over designate.conf
|
||||||
merge_configs:
|
|
||||||
vars:
|
vars:
|
||||||
service_name: "{{ item.key }}"
|
service_name: "{{ item.key }}"
|
||||||
|
merge_configs:
|
||||||
sources:
|
sources:
|
||||||
- "{{ role_path }}/templates/designate.conf.j2"
|
- "{{ role_path }}/templates/designate.conf.j2"
|
||||||
- "{{ node_custom_config }}/global.conf"
|
- "{{ node_custom_config }}/global.conf"
|
||||||
|
@ -34,9 +34,9 @@
|
|||||||
- Restart freezer-api container
|
- Restart freezer-api container
|
||||||
|
|
||||||
- name: Copying over freezer-api.conf
|
- name: Copying over freezer-api.conf
|
||||||
merge_configs:
|
|
||||||
vars:
|
vars:
|
||||||
service_name: "{{ item.key }}"
|
service_name: "{{ item.key }}"
|
||||||
|
merge_configs:
|
||||||
sources:
|
sources:
|
||||||
- "{{ role_path }}/templates/freezer-api.conf.j2"
|
- "{{ role_path }}/templates/freezer-api.conf.j2"
|
||||||
- "{{ node_custom_config }}/global.conf"
|
- "{{ node_custom_config }}/global.conf"
|
||||||
|
@ -23,9 +23,9 @@
|
|||||||
- Restart glance-registry container
|
- Restart glance-registry container
|
||||||
|
|
||||||
- name: Copying over glance-*.conf
|
- name: Copying over glance-*.conf
|
||||||
merge_configs:
|
|
||||||
vars:
|
vars:
|
||||||
service_name: "{{ item.key }}"
|
service_name: "{{ item.key }}"
|
||||||
|
merge_configs:
|
||||||
sources:
|
sources:
|
||||||
- "{{ role_path }}/templates/{{ item.key }}.conf.j2"
|
- "{{ role_path }}/templates/{{ item.key }}.conf.j2"
|
||||||
- "{{ node_custom_config }}/global.conf"
|
- "{{ node_custom_config }}/global.conf"
|
||||||
|
@ -10,9 +10,9 @@
|
|||||||
- "gnocchi-statsd"
|
- "gnocchi-statsd"
|
||||||
|
|
||||||
- name: Copying over ceph.conf(s)
|
- name: Copying over ceph.conf(s)
|
||||||
merge_configs:
|
|
||||||
vars:
|
vars:
|
||||||
service_name: "{{ item }}"
|
service_name: "{{ item }}"
|
||||||
|
merge_configs:
|
||||||
sources:
|
sources:
|
||||||
- "{{ role_path }}/../ceph/templates/ceph.conf.j2"
|
- "{{ role_path }}/../ceph/templates/ceph.conf.j2"
|
||||||
- "{{ node_custom_config }}/ceph.conf"
|
- "{{ node_custom_config }}/ceph.conf"
|
||||||
|
@ -24,9 +24,9 @@
|
|||||||
- Restart gnocchi-statsd container
|
- Restart gnocchi-statsd container
|
||||||
|
|
||||||
- name: Copying over gnocchi.conf
|
- name: Copying over gnocchi.conf
|
||||||
merge_configs:
|
|
||||||
vars:
|
vars:
|
||||||
service_name: "{{ item.key }}"
|
service_name: "{{ item.key }}"
|
||||||
|
merge_configs:
|
||||||
sources:
|
sources:
|
||||||
- "{{ role_path }}/templates/gnocchi.conf.j2"
|
- "{{ role_path }}/templates/gnocchi.conf.j2"
|
||||||
- "{{ node_custom_config }}/global.conf"
|
- "{{ node_custom_config }}/global.conf"
|
||||||
|
@ -22,9 +22,9 @@
|
|||||||
- Restart grafana container
|
- Restart grafana container
|
||||||
|
|
||||||
- name: Copying over grafana.ini
|
- name: Copying over grafana.ini
|
||||||
merge_configs:
|
|
||||||
vars:
|
vars:
|
||||||
service_name: "{{ item.key }}"
|
service_name: "{{ item.key }}"
|
||||||
|
merge_configs:
|
||||||
sources:
|
sources:
|
||||||
- "{{ role_path }}/templates/grafana.ini.j2"
|
- "{{ role_path }}/templates/grafana.ini.j2"
|
||||||
- "{{ node_custom_config }}/{{ item.key }}.ini"
|
- "{{ node_custom_config }}/{{ item.key }}.ini"
|
||||||
|
@ -31,9 +31,9 @@
|
|||||||
- "heat-engine"
|
- "heat-engine"
|
||||||
|
|
||||||
- name: Copying over heat.conf
|
- name: Copying over heat.conf
|
||||||
merge_configs:
|
|
||||||
vars:
|
vars:
|
||||||
service_name: "{{ item.key }}"
|
service_name: "{{ item.key }}"
|
||||||
|
merge_configs:
|
||||||
sources:
|
sources:
|
||||||
- "{{ role_path }}/templates/heat.conf.j2"
|
- "{{ role_path }}/templates/heat.conf.j2"
|
||||||
- "{{ node_custom_config }}/global.conf"
|
- "{{ node_custom_config }}/global.conf"
|
||||||
|
@ -23,9 +23,9 @@
|
|||||||
- "ironic-dnsmasq"
|
- "ironic-dnsmasq"
|
||||||
|
|
||||||
- name: Copying over ironic.conf
|
- name: Copying over ironic.conf
|
||||||
merge_configs:
|
|
||||||
vars:
|
vars:
|
||||||
service_name: "{{ item }}"
|
service_name: "{{ item }}"
|
||||||
|
merge_configs:
|
||||||
sources:
|
sources:
|
||||||
- "{{ role_path }}/templates/ironic.conf.j2"
|
- "{{ role_path }}/templates/ironic.conf.j2"
|
||||||
- "{{ node_custom_config }}/global.conf"
|
- "{{ node_custom_config }}/global.conf"
|
||||||
@ -40,9 +40,9 @@
|
|||||||
- "ironic-conductor"
|
- "ironic-conductor"
|
||||||
|
|
||||||
- name: Copying over inspector.conf
|
- name: Copying over inspector.conf
|
||||||
merge_configs:
|
|
||||||
vars:
|
vars:
|
||||||
service_name: "ironic-inspector"
|
service_name: "ironic-inspector"
|
||||||
|
merge_configs:
|
||||||
sources:
|
sources:
|
||||||
- "{{ role_path }}/templates/ironic-inspector.conf.j2"
|
- "{{ role_path }}/templates/ironic-inspector.conf.j2"
|
||||||
- "{{ node_custom_config }}/global.conf"
|
- "{{ node_custom_config }}/global.conf"
|
||||||
|
@ -24,9 +24,9 @@
|
|||||||
- Restart karbor-operationengine container
|
- Restart karbor-operationengine container
|
||||||
|
|
||||||
- name: Copying over karbor.conf
|
- name: Copying over karbor.conf
|
||||||
merge_configs:
|
|
||||||
vars:
|
vars:
|
||||||
service_name: "{{ item.key }}"
|
service_name: "{{ item.key }}"
|
||||||
|
merge_configs:
|
||||||
sources:
|
sources:
|
||||||
- "{{ role_path }}/templates/karbor.conf.j2"
|
- "{{ role_path }}/templates/karbor.conf.j2"
|
||||||
- "{{ node_custom_config }}/global.conf"
|
- "{{ node_custom_config }}/global.conf"
|
||||||
|
@ -32,9 +32,9 @@
|
|||||||
- Restart keystone-fernet container
|
- Restart keystone-fernet container
|
||||||
|
|
||||||
- name: Copying over keystone.conf
|
- name: Copying over keystone.conf
|
||||||
merge_configs:
|
|
||||||
vars:
|
vars:
|
||||||
service_name: "{{ item.key }}"
|
service_name: "{{ item.key }}"
|
||||||
|
merge_configs:
|
||||||
sources:
|
sources:
|
||||||
- "{{ role_path }}/templates/keystone.conf.j2"
|
- "{{ role_path }}/templates/keystone.conf.j2"
|
||||||
- "{{ node_custom_config }}/global.conf"
|
- "{{ node_custom_config }}/global.conf"
|
||||||
|
@ -22,9 +22,9 @@
|
|||||||
- Restart kuryr container
|
- Restart kuryr container
|
||||||
|
|
||||||
- name: Copying over kuryr.conf
|
- name: Copying over kuryr.conf
|
||||||
merge_configs:
|
|
||||||
vars:
|
vars:
|
||||||
service_name: "{{ item.key }}"
|
service_name: "{{ item.key }}"
|
||||||
|
merge_configs:
|
||||||
sources:
|
sources:
|
||||||
- "{{ role_path }}/templates/kuryr.conf.j2"
|
- "{{ role_path }}/templates/kuryr.conf.j2"
|
||||||
- "{{ node_custom_config }}/global.conf"
|
- "{{ node_custom_config }}/global.conf"
|
||||||
|
@ -23,9 +23,9 @@
|
|||||||
- Restart magnum-conductor container
|
- Restart magnum-conductor container
|
||||||
|
|
||||||
- name: Copying over magnum.conf
|
- name: Copying over magnum.conf
|
||||||
merge_configs:
|
|
||||||
vars:
|
vars:
|
||||||
service_name: "{{ item.key }}"
|
service_name: "{{ item.key }}"
|
||||||
|
merge_configs:
|
||||||
sources:
|
sources:
|
||||||
- "{{ role_path }}/templates/magnum.conf.j2"
|
- "{{ role_path }}/templates/magnum.conf.j2"
|
||||||
- "{{ node_custom_config }}/global.conf"
|
- "{{ node_custom_config }}/global.conf"
|
||||||
|
@ -22,9 +22,9 @@
|
|||||||
- "Restart {{ item.key }} container"
|
- "Restart {{ item.key }} container"
|
||||||
|
|
||||||
- name: Copying over manila.conf
|
- name: Copying over manila.conf
|
||||||
merge_configs:
|
|
||||||
vars:
|
vars:
|
||||||
service_name: "{{ item.key }}"
|
service_name: "{{ item.key }}"
|
||||||
|
merge_configs:
|
||||||
sources:
|
sources:
|
||||||
- "{{ role_path }}/templates/manila.conf.j2"
|
- "{{ role_path }}/templates/manila.conf.j2"
|
||||||
- "{{ node_custom_config }}/global.conf"
|
- "{{ node_custom_config }}/global.conf"
|
||||||
@ -48,9 +48,8 @@
|
|||||||
- name: Copying over manila-share.conf
|
- name: Copying over manila-share.conf
|
||||||
vars:
|
vars:
|
||||||
service: "{{ manila_services['manila-share'] }}"
|
service: "{{ manila_services['manila-share'] }}"
|
||||||
merge_configs:
|
|
||||||
vars:
|
|
||||||
service_name: "{{ item }}"
|
service_name: "{{ item }}"
|
||||||
|
merge_configs:
|
||||||
sources:
|
sources:
|
||||||
- "{{ role_path }}/templates/manila.conf.j2"
|
- "{{ role_path }}/templates/manila.conf.j2"
|
||||||
- "{{ role_path }}/templates/manila-share.conf.j2"
|
- "{{ role_path }}/templates/manila-share.conf.j2"
|
||||||
|
@ -15,9 +15,9 @@
|
|||||||
- "mariadb"
|
- "mariadb"
|
||||||
|
|
||||||
- name: Copying over galera.cnf
|
- name: Copying over galera.cnf
|
||||||
merge_configs:
|
|
||||||
vars:
|
vars:
|
||||||
service_name: "{{ item }}"
|
service_name: "{{ item }}"
|
||||||
|
merge_configs:
|
||||||
sources:
|
sources:
|
||||||
- "{{ role_path }}/templates/galera.cnf.j2"
|
- "{{ role_path }}/templates/galera.cnf.j2"
|
||||||
- "{{ node_custom_config }}/galera.cnf"
|
- "{{ node_custom_config }}/galera.cnf"
|
||||||
|
@ -20,9 +20,9 @@
|
|||||||
- Restart {{ item.key }} container
|
- Restart {{ item.key }} container
|
||||||
|
|
||||||
- name: Copying over mistral.conf
|
- name: Copying over mistral.conf
|
||||||
merge_configs:
|
|
||||||
vars:
|
vars:
|
||||||
service_name: "{{ item.key }}"
|
service_name: "{{ item.key }}"
|
||||||
|
merge_configs:
|
||||||
sources:
|
sources:
|
||||||
- "{{ role_path }}/templates/mistral.conf.j2"
|
- "{{ role_path }}/templates/mistral.conf.j2"
|
||||||
- "{{ node_custom_config }}/global.conf"
|
- "{{ node_custom_config }}/global.conf"
|
||||||
|
@ -17,9 +17,9 @@
|
|||||||
- "murano-engine"
|
- "murano-engine"
|
||||||
|
|
||||||
- name: Copying over murano.conf
|
- name: Copying over murano.conf
|
||||||
merge_configs:
|
|
||||||
vars:
|
vars:
|
||||||
service_name: "{{ item }}"
|
service_name: "{{ item }}"
|
||||||
|
merge_configs:
|
||||||
sources:
|
sources:
|
||||||
- "{{ role_path }}/templates/murano.conf.j2"
|
- "{{ role_path }}/templates/murano.conf.j2"
|
||||||
- "{{ node_custom_config }}/global.conf"
|
- "{{ node_custom_config }}/global.conf"
|
||||||
|
@ -18,9 +18,9 @@
|
|||||||
- neutron_plugin_agent == "openvswitch"
|
- neutron_plugin_agent == "openvswitch"
|
||||||
|
|
||||||
- name: Copying over neutron.conf
|
- name: Copying over neutron.conf
|
||||||
merge_configs:
|
|
||||||
vars:
|
vars:
|
||||||
service_name: "{{ item }}"
|
service_name: "{{ item }}"
|
||||||
|
merge_configs:
|
||||||
sources:
|
sources:
|
||||||
- "{{ role_path }}/templates/neutron.conf.j2"
|
- "{{ role_path }}/templates/neutron.conf.j2"
|
||||||
- "{{ node_custom_config }}/global.conf"
|
- "{{ node_custom_config }}/global.conf"
|
||||||
@ -37,9 +37,9 @@
|
|||||||
- neutron_plugin_agent == "openvswitch"
|
- neutron_plugin_agent == "openvswitch"
|
||||||
|
|
||||||
- name: Copying over ml2_conf.ini
|
- name: Copying over ml2_conf.ini
|
||||||
merge_configs:
|
|
||||||
vars:
|
vars:
|
||||||
service_name: "{{ item }}"
|
service_name: "{{ item }}"
|
||||||
|
merge_configs:
|
||||||
sources:
|
sources:
|
||||||
- "{{ role_path }}/templates/ml2_conf.ini.j2"
|
- "{{ role_path }}/templates/ml2_conf.ini.j2"
|
||||||
- "{{ node_custom_config }}/neutron/ml2_conf.ini"
|
- "{{ node_custom_config }}/neutron/ml2_conf.ini"
|
||||||
|
@ -9,9 +9,9 @@
|
|||||||
when: inventory_hostname in groups['compute']
|
when: inventory_hostname in groups['compute']
|
||||||
|
|
||||||
- name: Copying over ceph.conf(s)
|
- name: Copying over ceph.conf(s)
|
||||||
merge_configs:
|
|
||||||
vars:
|
vars:
|
||||||
service_name: "{{ item }}"
|
service_name: "{{ item }}"
|
||||||
|
merge_configs:
|
||||||
sources:
|
sources:
|
||||||
- "{{ role_path }}/../ceph/templates/ceph.conf.j2"
|
- "{{ role_path }}/../ceph/templates/ceph.conf.j2"
|
||||||
- "{{ node_custom_config }}/ceph.conf"
|
- "{{ node_custom_config }}/ceph.conf"
|
||||||
|
@ -17,9 +17,9 @@
|
|||||||
- Restart nova-compute-fake containers
|
- Restart nova-compute-fake containers
|
||||||
|
|
||||||
- name: Copying over nova.conf
|
- name: Copying over nova.conf
|
||||||
merge_configs:
|
|
||||||
vars:
|
vars:
|
||||||
service_name: "{{ item }}"
|
service_name: "{{ item }}"
|
||||||
|
merge_configs:
|
||||||
sources:
|
sources:
|
||||||
- "{{ role_path }}/templates/nova.conf.j2"
|
- "{{ role_path }}/templates/nova.conf.j2"
|
||||||
- "{{ node_custom_config }}/global.conf"
|
- "{{ node_custom_config }}/global.conf"
|
||||||
|
@ -45,9 +45,8 @@
|
|||||||
- nova-serialproxy
|
- nova-serialproxy
|
||||||
- nova-scheduler
|
- nova-scheduler
|
||||||
- nova-spicehtml5proxy
|
- nova-spicehtml5proxy
|
||||||
merge_configs:
|
|
||||||
vars:
|
|
||||||
service_name: "{{ item.key }}"
|
service_name: "{{ item.key }}"
|
||||||
|
merge_configs:
|
||||||
sources:
|
sources:
|
||||||
- "{{ role_path }}/templates/nova.conf.j2"
|
- "{{ role_path }}/templates/nova.conf.j2"
|
||||||
- "{{ node_custom_config }}/global.conf"
|
- "{{ node_custom_config }}/global.conf"
|
||||||
|
@ -22,9 +22,9 @@
|
|||||||
- "Restart {{ item.key }} container"
|
- "Restart {{ item.key }} container"
|
||||||
|
|
||||||
- name: Copying over octavia.conf
|
- name: Copying over octavia.conf
|
||||||
merge_configs:
|
|
||||||
vars:
|
vars:
|
||||||
service_name: "{{ item.key }}"
|
service_name: "{{ item.key }}"
|
||||||
|
merge_configs:
|
||||||
sources:
|
sources:
|
||||||
- "{{ role_path }}/templates/octavia.conf.j2"
|
- "{{ role_path }}/templates/octavia.conf.j2"
|
||||||
- "{{ node_custom_config }}/global.conf"
|
- "{{ node_custom_config }}/global.conf"
|
||||||
|
@ -22,9 +22,9 @@
|
|||||||
- Restart panko-api container
|
- Restart panko-api container
|
||||||
|
|
||||||
- name: Copying over panko.conf
|
- name: Copying over panko.conf
|
||||||
merge_configs:
|
|
||||||
vars:
|
vars:
|
||||||
service_name: "{{ item.key }}"
|
service_name: "{{ item.key }}"
|
||||||
|
merge_configs:
|
||||||
sources:
|
sources:
|
||||||
- "{{ role_path }}/templates/panko.conf.j2"
|
- "{{ role_path }}/templates/panko.conf.j2"
|
||||||
- "{{ node_custom_config }}/global.conf"
|
- "{{ node_custom_config }}/global.conf"
|
||||||
|
@ -22,9 +22,9 @@
|
|||||||
- Restart rally container
|
- Restart rally container
|
||||||
|
|
||||||
- name: Copying over rally.conf
|
- name: Copying over rally.conf
|
||||||
merge_configs:
|
|
||||||
vars:
|
vars:
|
||||||
service_name: "{{ item.key }}"
|
service_name: "{{ item.key }}"
|
||||||
|
merge_configs:
|
||||||
sources:
|
sources:
|
||||||
- "{{ role_path }}/templates/rally.conf.j2"
|
- "{{ role_path }}/templates/rally.conf.j2"
|
||||||
- "{{ node_custom_config }}/rally.conf"
|
- "{{ node_custom_config }}/rally.conf"
|
||||||
|
@ -23,9 +23,9 @@
|
|||||||
- Restart sahara-engine container
|
- Restart sahara-engine container
|
||||||
|
|
||||||
- name: Copying over sahara.conf
|
- name: Copying over sahara.conf
|
||||||
merge_configs:
|
|
||||||
vars:
|
vars:
|
||||||
service_name: "{{ item.key }}"
|
service_name: "{{ item.key }}"
|
||||||
|
merge_configs:
|
||||||
sources:
|
sources:
|
||||||
- "{{ role_path }}/templates/sahara.conf.j2"
|
- "{{ role_path }}/templates/sahara.conf.j2"
|
||||||
- "{{ node_custom_config }}/global.conf"
|
- "{{ node_custom_config }}/global.conf"
|
||||||
|
@ -20,9 +20,9 @@
|
|||||||
with_dict: "{{ searchlight_services }}"
|
with_dict: "{{ searchlight_services }}"
|
||||||
|
|
||||||
- name: Copying over searchlight.conf
|
- name: Copying over searchlight.conf
|
||||||
merge_configs:
|
|
||||||
vars:
|
vars:
|
||||||
service_name: "{{ item.key }}"
|
service_name: "{{ item.key }}"
|
||||||
|
merge_configs:
|
||||||
sources:
|
sources:
|
||||||
- "{{ role_path }}/templates/searchlight.conf.j2"
|
- "{{ role_path }}/templates/searchlight.conf.j2"
|
||||||
- "{{ node_custom_config }}/global.conf"
|
- "{{ node_custom_config }}/global.conf"
|
||||||
|
@ -23,9 +23,9 @@
|
|||||||
- Restart senlin-engine container
|
- Restart senlin-engine container
|
||||||
|
|
||||||
- name: Copying over senlin.conf
|
- name: Copying over senlin.conf
|
||||||
merge_configs:
|
|
||||||
vars:
|
vars:
|
||||||
service_name: "{{ item.key }}"
|
service_name: "{{ item.key }}"
|
||||||
|
merge_configs:
|
||||||
sources:
|
sources:
|
||||||
- "{{ role_path }}/templates/senlin.conf.j2"
|
- "{{ role_path }}/templates/senlin.conf.j2"
|
||||||
- "{{ node_custom_config }}/global.conf"
|
- "{{ node_custom_config }}/global.conf"
|
||||||
|
@ -25,9 +25,9 @@
|
|||||||
- Restart solum-worker container
|
- Restart solum-worker container
|
||||||
|
|
||||||
- name: Copying over solum.conf
|
- name: Copying over solum.conf
|
||||||
merge_configs:
|
|
||||||
vars:
|
vars:
|
||||||
service_name: "{{ item.key }}"
|
service_name: "{{ item.key }}"
|
||||||
|
merge_configs:
|
||||||
sources:
|
sources:
|
||||||
- "{{ role_path }}/templates/solum.conf.j2"
|
- "{{ role_path }}/templates/solum.conf.j2"
|
||||||
- "{{ node_custom_config }}/global.conf"
|
- "{{ node_custom_config }}/global.conf"
|
||||||
|
@ -44,9 +44,9 @@
|
|||||||
- "swift-rsyncd"
|
- "swift-rsyncd"
|
||||||
|
|
||||||
- name: Copying over swift.conf
|
- name: Copying over swift.conf
|
||||||
merge_configs:
|
|
||||||
vars:
|
vars:
|
||||||
service_name: "swift-{{ item }}"
|
service_name: "swift-{{ item }}"
|
||||||
|
merge_configs:
|
||||||
sources:
|
sources:
|
||||||
- "{{ role_path }}/templates/swift.conf.j2"
|
- "{{ role_path }}/templates/swift.conf.j2"
|
||||||
- "{{ node_custom_config }}/global.conf"
|
- "{{ node_custom_config }}/global.conf"
|
||||||
@ -71,9 +71,9 @@
|
|||||||
- "proxy-server"
|
- "proxy-server"
|
||||||
|
|
||||||
- name: Copying over account-*.conf
|
- name: Copying over account-*.conf
|
||||||
merge_configs:
|
|
||||||
vars:
|
vars:
|
||||||
service_name: "swift-{{ item }}"
|
service_name: "swift-{{ item }}"
|
||||||
|
merge_configs:
|
||||||
sources:
|
sources:
|
||||||
- "{{ role_path }}/templates/account.conf.j2"
|
- "{{ role_path }}/templates/account.conf.j2"
|
||||||
- "{{ node_custom_config }}/global.conf"
|
- "{{ node_custom_config }}/global.conf"
|
||||||
@ -88,9 +88,9 @@
|
|||||||
- "account-server"
|
- "account-server"
|
||||||
|
|
||||||
- name: Copying over container-*.conf
|
- name: Copying over container-*.conf
|
||||||
merge_configs:
|
|
||||||
vars:
|
vars:
|
||||||
service_name: "swift-{{ item }}"
|
service_name: "swift-{{ item }}"
|
||||||
|
merge_configs:
|
||||||
sources:
|
sources:
|
||||||
- "{{ role_path }}/templates/container.conf.j2"
|
- "{{ role_path }}/templates/container.conf.j2"
|
||||||
- "{{ node_custom_config }}/global.conf"
|
- "{{ node_custom_config }}/global.conf"
|
||||||
@ -105,9 +105,9 @@
|
|||||||
- "container-updater"
|
- "container-updater"
|
||||||
|
|
||||||
- name: Copying over object-*.conf
|
- name: Copying over object-*.conf
|
||||||
merge_configs:
|
|
||||||
vars:
|
vars:
|
||||||
service_name: "swift-{{ item }}"
|
service_name: "swift-{{ item }}"
|
||||||
|
merge_configs:
|
||||||
sources:
|
sources:
|
||||||
- "{{ role_path }}/templates/object.conf.j2"
|
- "{{ role_path }}/templates/object.conf.j2"
|
||||||
- "{{ node_custom_config }}/global.conf"
|
- "{{ node_custom_config }}/global.conf"
|
||||||
@ -123,9 +123,9 @@
|
|||||||
- "object-updater"
|
- "object-updater"
|
||||||
|
|
||||||
- name: Copying over proxy-server.conf
|
- name: Copying over proxy-server.conf
|
||||||
merge_configs:
|
|
||||||
vars:
|
vars:
|
||||||
service_name: "swift-{{ item }}"
|
service_name: "swift-{{ item }}"
|
||||||
|
merge_configs:
|
||||||
sources:
|
sources:
|
||||||
- "{{ role_path }}/templates/proxy-server.conf.j2"
|
- "{{ role_path }}/templates/proxy-server.conf.j2"
|
||||||
- "{{ node_custom_config }}/global.conf"
|
- "{{ node_custom_config }}/global.conf"
|
||||||
|
@ -22,9 +22,9 @@
|
|||||||
- Restart tacker container
|
- Restart tacker container
|
||||||
|
|
||||||
- name: Copying over tacker.conf
|
- name: Copying over tacker.conf
|
||||||
merge_configs:
|
|
||||||
vars:
|
vars:
|
||||||
service_name: "{{ item.key }}"
|
service_name: "{{ item.key }}"
|
||||||
|
merge_configs:
|
||||||
sources:
|
sources:
|
||||||
- "{{ role_path }}/templates/tacker.conf.j2"
|
- "{{ role_path }}/templates/tacker.conf.j2"
|
||||||
- "{{ node_custom_config }}/global.conf"
|
- "{{ node_custom_config }}/global.conf"
|
||||||
|
@ -22,9 +22,9 @@
|
|||||||
- Restart tempest container
|
- Restart tempest container
|
||||||
|
|
||||||
- name: Copying over tempest.conf
|
- name: Copying over tempest.conf
|
||||||
merge_configs:
|
|
||||||
vars:
|
vars:
|
||||||
project_name: "tempest"
|
project_name: "tempest"
|
||||||
|
merge_configs:
|
||||||
sources:
|
sources:
|
||||||
- "{{ role_path }}/templates/tempest.conf.j2"
|
- "{{ role_path }}/templates/tempest.conf.j2"
|
||||||
- "{{ node_custom_config }}/tempest.conf"
|
- "{{ node_custom_config }}/tempest.conf"
|
||||||
|
@ -36,9 +36,9 @@
|
|||||||
- Restart trove-taskmanager container
|
- Restart trove-taskmanager container
|
||||||
|
|
||||||
- name: Copying over trove.conf
|
- name: Copying over trove.conf
|
||||||
merge_configs:
|
|
||||||
vars:
|
vars:
|
||||||
service_name: "{{ item.key }}"
|
service_name: "{{ item.key }}"
|
||||||
|
merge_configs:
|
||||||
sources:
|
sources:
|
||||||
- "{{ role_path }}/templates/trove.conf.j2"
|
- "{{ role_path }}/templates/trove.conf.j2"
|
||||||
- "{{ node_custom_config }}/global.conf"
|
- "{{ node_custom_config }}/global.conf"
|
||||||
|
@ -24,9 +24,9 @@
|
|||||||
- Restart watcher-applier container
|
- Restart watcher-applier container
|
||||||
|
|
||||||
- name: Copying over watcher.conf
|
- name: Copying over watcher.conf
|
||||||
merge_configs:
|
|
||||||
vars:
|
vars:
|
||||||
service_name: "{{ item.key }}"
|
service_name: "{{ item.key }}"
|
||||||
|
merge_configs:
|
||||||
sources:
|
sources:
|
||||||
- "{{ role_path }}/templates/watcher.conf.j2"
|
- "{{ role_path }}/templates/watcher.conf.j2"
|
||||||
- "{{ node_custom_config }}/global.conf"
|
- "{{ node_custom_config }}/global.conf"
|
||||||
|
@ -21,9 +21,9 @@
|
|||||||
- Restart zun-compute container
|
- Restart zun-compute container
|
||||||
|
|
||||||
- name: Copying over zun.conf
|
- name: Copying over zun.conf
|
||||||
merge_configs:
|
|
||||||
vars:
|
vars:
|
||||||
service_name: "{{ item.key }}"
|
service_name: "{{ item.key }}"
|
||||||
|
merge_configs:
|
||||||
sources:
|
sources:
|
||||||
- "{{ role_path }}/templates/zun.conf.j2"
|
- "{{ role_path }}/templates/zun.conf.j2"
|
||||||
- "{{ node_custom_config }}/global.conf"
|
- "{{ node_custom_config }}/global.conf"
|
||||||
|
Loading…
Reference in New Issue
Block a user