diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2017-01-31 10:15:48 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2017-01-31 10:15:48 +0000 |
| commit | 8f37ea165b75ff9cb069a7b0fd45e4d30a4c3c26 (patch) | |
| tree | cb5ad0edf8e8f437e5dbf5a4dae4b4fe670ce0ca /docker/services/neutron-ovs-agent.yaml | |
| parent | 716374680b3d77745adb382a86dfe92801b803b2 (diff) | |
| parent | 9d82796da2ae30be4eb3dfcc9612c6947f882ded (diff) | |
Merge "docker: eliminate copy-json.py in favor of json-file"
Diffstat (limited to 'docker/services/neutron-ovs-agent.yaml')
| -rw-r--r-- | docker/services/neutron-ovs-agent.yaml | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/docker/services/neutron-ovs-agent.yaml b/docker/services/neutron-ovs-agent.yaml index 1c9e60db..0a061f6c 100644 --- a/docker/services/neutron-ovs-agent.yaml +++ b/docker/services/neutron-ovs-agent.yaml @@ -43,6 +43,22 @@ outputs: config_settings: {get_attr: [NeutronOvsAgentBase, role_data, config_settings]} step_config: {get_attr: [NeutronOvsAgentBase, role_data, step_config]} puppet_tags: neutron_config,neutron_agent_ovs,neutron_plugin_ml2 + kolla_config: + /var/lib/etc-data/json-config/neutron-openvswitch-agent.json: + command: /usr/bin/neutron-openvswitch-agent --config-file /etc/neutron/neutron.conf --config-file /etc/neutron/plugins/ml2/openvswitch_agent.ini --config-file /etc/neutron/plugins/ml2/ml2_conf.ini + config_files: + - dest: /etc/neutron/neutron.conf + owner: neutron + perm: '0600' + source: /var/lib/kolla/config_files/neutron.conf + - dest: /etc/neutron/plugins/ml2/openvswitch_agent.ini + owner: neutron + perm: '0600' + source: /var/lib/kolla/config_files/openvswitch_agent.ini + - dest: /etc/neutron/plugins/ml2/ml2_conf.ini + owner: neutron + perm: '0600' + source: /var/lib/kolla/config_files/ml2_conf.ini docker_config: step_1: neutronovsagent: |