diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-07-23 18:57:42 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-07-23 18:57:42 +0000 |
| commit | 922093044e7043d83ee16c278b856bb0a02604a2 (patch) | |
| tree | a8236ff31b5e8af11369c652af882f0c720ecea7 /docker | |
| parent | c0a72cefb31d06b7617c667278365916dd25e0da (diff) | |
| parent | d1f2ec8c8af5aafa34a8f57711b95256b0304612 (diff) | |
| download | kolla-922093044e7043d83ee16c278b856bb0a02604a2.tar.gz kolla-922093044e7043d83ee16c278b856bb0a02604a2.zip | |
Merge "Properly use all configs with neutron"
Diffstat (limited to 'docker')
| -rwxr-xr-x | docker/common/neutron/neutron-dhcp-agent/config-external.sh | 2 | ||||
| -rwxr-xr-x | docker/common/neutron/neutron-metadata-agent/config-external.sh | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/docker/common/neutron/neutron-dhcp-agent/config-external.sh b/docker/common/neutron/neutron-dhcp-agent/config-external.sh index ccf5cbe78..badbd86a1 100755 --- a/docker/common/neutron/neutron-dhcp-agent/config-external.sh +++ b/docker/common/neutron/neutron-dhcp-agent/config-external.sh @@ -1,5 +1,5 @@ #!/bin/bash -SOURCES="/opt/kolla/neutron-dhcp-agent/neutron.conf /opt/kolla/neutron-dhcp-agent/dhcp_agent.ini /opt/kolla/neutron-dhcp-agent/dnsmasq.conf" +SOURCES="/opt/kolla/neutron-agents/neutron.conf /opt/kolla/neutron-agents/dhcp_agent.ini /opt/kolla/neutron-agents/dnsmasq.conf" TARGET="/etc/neutron/" OWNER="neutron" diff --git a/docker/common/neutron/neutron-metadata-agent/config-external.sh b/docker/common/neutron/neutron-metadata-agent/config-external.sh index 1d3921782..319ee3793 100755 --- a/docker/common/neutron/neutron-metadata-agent/config-external.sh +++ b/docker/common/neutron/neutron-metadata-agent/config-external.sh @@ -1,5 +1,5 @@ #!/bin/bash -SOURCES="/opt/kolla/neutron-metadata-agent/neutron.conf /opt/kolla/neutron-metadata-agent/metadata_agent.ini" +SOURCES="/opt/kolla/neutron-agents/neutron.conf /opt/kolla/neutron-agents/metadata_agent.ini" TARGET="/etc/neutron/" OWNER="neutron" |