diff options
| author |   Michael Polenchuk <mpolenchuk@mirantis.com> | 2017-02-22 15:02:19 +0400 |
|---|---|---|
| committer | Michael Polenchuk <mpolenchuk@mirantis.com> | 2017-02-22 15:02:19 +0400 |
| commit | 25ee57db17d936077dfc5c712308d3aeaf9fa95b (patch) | |
| tree | 949d73cd5b2076360ac519adf3b88234d760e500 /labs/lf | |
| parent | e8a6cd835320940bd407996a7fc078517a760217 (diff) | |
[lf-pod2] Mend dns and ntp servers settings
Change-Id: I55d896b3cdc261681d998d1d305854035b0ccc53
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
Diffstat (limited to 'labs/lf')
| -rw-r--r-- | labs/lf/pod2/fuel/config/dea-pod-override.yaml | 29 |
1 files changed, 17 insertions, 12 deletions
diff --git a/labs/lf/pod2/fuel/config/dea-pod-override.yaml b/labs/lf/pod2/fuel/config/dea-pod-override.yaml index 6117231..f4401a3 100644 --- a/labs/lf/pod2/fuel/config/dea-pod-override.yaml +++ b/labs/lf/pod2/fuel/config/dea-pod-override.yaml @@ -1,8 +1,8 @@ dea-pod-override-config-metadata: title: 'Deployment Environment Adapter POD override for LF, POD2' - version: '0.2' + version: '0.3' created: 'Wed Feb 3 2016' - comment: 'Config for LF POD2, Rebased for Fuel8' + comment: 'Config for LF POD2, Rebased for Fuel10' environment: name: opnfv interfaces_1: @@ -173,13 +173,15 @@ settings: editable: external_dns: dns_list: - description: List of upstream DNS servers, separated by comma + description: List of upstream DNS servers label: DNS list + max: 3 regex: - error: Invalid IP address list - source: ^\*$|^(?:\d|1?\d\d|2[0-4]\d|25[0-5])(?:\.(?:\d|1?\d\d|2[0-4]\d|25[0-5])){3}(?:\s*,\s*(?:\d|1?\d\d|2[0-4]\d|25[0-5])(?:\.(?:\d|1?\d\d|2[0-4]\d|25[0-5])){3})*$ - type: text - value: 8.8.8.8 + error: Invalid IP address + source: ^(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])$ + type: text_list + value: + - 8.8.8.8 weight: 10 metadata: group: network @@ -191,13 +193,16 @@ settings: label: Host OS NTP Servers weight: 40 ntp_list: - description: List of upstream NTP servers, separated by comma + description: List of upstream NTP servers label: NTP server list regex: - error: Invalid NTP server list - source: ^\s*(?:(?:\w+(?:-+\w+)*\.)+[a-z]+|\d{1,3}(?:\.\d{1,3}){3})\s*(?:,\s*(?:(?:\w+(?:-+\w+)*\.)+[a-z]+|\d{1,3}(\.\d{1,3}){3})\s*)*$ - type: text - value: 0.pool.ntp.org, 1.pool.ntp.org, 2.pool.ntp.org + error: Invalid NTP server + source: ^[a-zA-Z\d]+[-\.\da-zA-Z]*$ + type: text_list + value: + - 0.pool.ntp.org + - 1.pool.ntp.org + - 2.pool.ntp.org weight: 10 syslog: metadata: |