diff options
| author |   Michael Polenchuk <mpolenchuk@mirantis.com> | 2018-09-07 10:54:50 +0400 |
|---|---|---|
| committer | Michael Polenchuk <mpolenchuk@mirantis.com> | 2018-09-07 10:54:50 +0400 |
| commit | 068021752e26e49792500786e1923f651443a955 (patch) | |
| tree | 71b7a2045045627ec2b03d9b5cdba14d66660be8 | |
| parent | f0b176221271f8441424b023edef85036c6d6af8 (diff) | |
[odl] Create parent directories for dhcp config
Change-Id: I7d16bcd42a059817d7a4e6b06490e03001354f4f
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
| -rw-r--r-- | mcp/salt-formulas/salt-formula-opendaylight/opendaylight/server.sls | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/mcp/salt-formulas/salt-formula-opendaylight/opendaylight/server.sls b/mcp/salt-formulas/salt-formula-opendaylight/opendaylight/server.sls index ff5a0bbfa..35ab35391 100644 --- a/mcp/salt-formulas/salt-formula-opendaylight/opendaylight/server.sls +++ b/mcp/salt-formulas/salt-formula-opendaylight/opendaylight/server.sls @@ -53,7 +53,6 @@ opendaylight: {%- endif %} - watch: - file: /opt/opendaylight/etc/jetty.xml - - file: /opt/opendaylight/etc/opendaylight/datastore/initial/config/netvirt-dhcpservice-config.xml - file: /opt/opendaylight/bin/setenv - ini: /opt/opendaylight/etc/org.apache.karaf.features.cfg - ini: /opt/opendaylight/etc/org.ops4j.pax.web.cfg @@ -101,11 +100,16 @@ opendaylight: - service: opendaylight {%- endif %} +{%- if server.dhcp.enabled %} /opt/opendaylight/etc/opendaylight/datastore/initial/config/netvirt-dhcpservice-config.xml: file.managed: - source: salt://opendaylight/files/netvirt-dhcpservice-config.xml + - makedirs: true + - watch_in: + - service: opendaylight - use: - file: /opt/opendaylight/etc/jetty.xml +{%- endif %} {%- if grains['cpuarch'] == 'aarch64' %} opendaylight-leveldbjni: |