From: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Date: Sun, 5 Feb 2017 01:57:02 +0000 (+0100)
Subject: arm-pod2: Redistribute roles, fix incomplete regex
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F47%2F28047%2F1;p=securedlab.git

arm-pod2: Redistribute roles, fix incomplete regex

JIRA: ARMBAND-209

Change-Id: I2cff456f1d3106e504ca8a70a308ac61322ea825
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
---

diff --git a/labs/arm/pod2/fuel/config/dea-pod-override.yaml b/labs/arm/pod2/fuel/config/dea-pod-override.yaml
index c303a73..e5a99eb 100644
--- a/labs/arm/pod2/fuel/config/dea-pod-override.yaml
+++ b/labs/arm/pod2/fuel/config/dea-pod-override.yaml
@@ -236,12 +236,12 @@ network:
     vlan_start: null
 nodes:
 - id: 1
+  role: controller,opendaylight
   interfaces: interfaces_2
-  role: ceph-osd,compute
   transformations: transformations_2
 - id: 2
   interfaces: interfaces_2
-  role: ceph-osd,compute
+  role: ceph-osd,controller
   transformations: transformations_2
 - id: 3
   interfaces: interfaces_1
@@ -249,11 +249,11 @@ nodes:
   transformations: transformations_1
 - id: 4
   interfaces: interfaces_1
-  role: controller,opendaylight
+  role: ceph-osd,compute
   transformations: transformations_1
 - id: 5
   interfaces: interfaces_1
-  role: ceph-osd,controller
+  role: ceph-osd,compute
   transformations: transformations_1
 settings:
   editable:
@@ -278,7 +278,7 @@ settings:
         min: 0
         regex:
           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]
+          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