diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-01-17 15:59:24 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-01-17 15:59:24 +0000 |
| commit | b0b3f6a229c55aba86498850b391833aed876850 (patch) | |
| tree | be32c06c928b75ccbc7500b9a183be86bc50d3a1 | |
| parent | d6071461d6ade4981fbd06e61dcc545e6357c69b (diff) | |
| parent | 3898205f0a342186e2e1caebe5c3535cf3bc6ee3 (diff) | |
| download | kolla-b0b3f6a229c55aba86498850b391833aed876850.tar.gz kolla-b0b3f6a229c55aba86498850b391833aed876850.zip | |
Merge "ironic-discoverd: fix ironic config file path"
| -rw-r--r-- | ansible/roles/ironic/templates/ironic-discoverd.json.j2 | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ansible/roles/ironic/templates/ironic-discoverd.json.j2 b/ansible/roles/ironic/templates/ironic-discoverd.json.j2 index 8ecc61171..29e0b9a65 100644 --- a/ansible/roles/ironic/templates/ironic-discoverd.json.j2 +++ b/ansible/roles/ironic/templates/ironic-discoverd.json.j2 @@ -1,9 +1,9 @@ { - "command": "ironic-discoverd --config-file /etc/ironic-discoverd/discoverd.conf", + "command": "ironic-discoverd --config-file /etc/ironic/ironic.conf", "config_files": [ { - "source": "{{ container_config_directory }}/discoverd.conf", - "dest": "/etc/ironic-discoverd/discoverd.conf", + "source": "{{ container_config_directory }}/ironic.conf", + "dest": "/etc/ironic/ironic.conf", "owner": "root", "perm": "0600" } |