FIX for Ubuntu repository settings in dea.yaml

Change-Id: Ia36bb75e91dd038755bfb6ada51d045d0877624e
Signed-off-by: Szilard Cserey <szilard.cserey@ericsson.com>

diff --git a/fuel/deploy/templates/hardware_environment/conf/ericsson_montreal_lab/dea.yaml b/fuel/deploy/templates/hardware_environment/conf/ericsson_montreal_lab/dea.yaml
index 4abab51..23b2809 100644 (file)
--- a/fuel/deploy/templates/hardware_environment/conf/ericsson_montreal_lab/dea.yaml
+++ b/fuel/deploy/templates/hardware_environment/conf/ericsson_montreal_lab/dea.yaml
@@ -669,13 +669,13 @@ settings:
         - name: ubuntu-updates
           priority: null
           section: main
-          suite: trusty-updates
+          suite: trusty
           type: deb
           uri: http://10.20.0.2:8080/ubuntu-part
         - name: ubuntu-security
           priority: null
           section: main
-          suite: trusty-security
+          suite: trusty
           type: deb
           uri: http://10.20.0.2:8080/ubuntu-part
         - name: mos

diff --git a/fuel/deploy/templates/hardware_environment/conf/linux_foundation_lab/pod1/dea.yaml b/fuel/deploy/templates/hardware_environment/conf/linux_foundation_lab/pod1/dea.yaml
index 762aebd..db29fe9 100644 (file)
--- a/fuel/deploy/templates/hardware_environment/conf/linux_foundation_lab/pod1/dea.yaml
+++ b/fuel/deploy/templates/hardware_environment/conf/linux_foundation_lab/pod1/dea.yaml
@@ -666,13 +666,13 @@ settings:
         - name: ubuntu-updates
           priority: null
           section: main
-          suite: trusty-updates
+          suite: trusty
           type: deb
           uri: http://10.20.0.2:8080/ubuntu-part
         - name: ubuntu-security
           priority: null
           section: main
-          suite: trusty-security
+          suite: trusty
           type: deb
           uri: http://10.20.0.2:8080/ubuntu-part
         - name: mos

diff --git a/fuel/deploy/templates/hardware_environment/conf/linux_foundation_lab/pod2/dea.yaml b/fuel/deploy/templates/hardware_environment/conf/linux_foundation_lab/pod2/dea.yaml
index 153af06..700bff3 100644 (file)
--- a/fuel/deploy/templates/hardware_environment/conf/linux_foundation_lab/pod2/dea.yaml
+++ b/fuel/deploy/templates/hardware_environment/conf/linux_foundation_lab/pod2/dea.yaml
@@ -666,13 +666,13 @@ settings:
         - name: ubuntu-updates
           priority: null
           section: main
-          suite: trusty-updates
+          suite: trusty
           type: deb
           uri: http://10.20.0.2:8080/ubuntu-part
         - name: ubuntu-security
           priority: null
           section: main
-          suite: trusty-security
+          suite: trusty
           type: deb
           uri: http://10.20.0.2:8080/ubuntu-part
         - name: mos

diff --git a/fuel/deploy/templates/hardware_environment/conf/opnfv_box/dea.yaml b/fuel/deploy/templates/hardware_environment/conf/opnfv_box/dea.yaml
index df6bf33..0895e4f 100644 (file)
--- a/fuel/deploy/templates/hardware_environment/conf/opnfv_box/dea.yaml
+++ b/fuel/deploy/templates/hardware_environment/conf/opnfv_box/dea.yaml
@@ -667,13 +667,13 @@ settings:
         - name: ubuntu-updates
           priority: null
           section: main
-          suite: trusty-updates
+          suite: trusty
           type: deb
           uri: http://10.20.0.2:8080/ubuntu-part
         - name: ubuntu-security
           priority: null
           section: main
-          suite: trusty-security
+          suite: trusty
           type: deb
           uri: http://10.20.0.2:8080/ubuntu-part
         - name: mos

diff --git a/fuel/deploy/templates/virtual_environment/conf/dea.yaml b/fuel/deploy/templates/virtual_environment/conf/dea.yaml
index c7a901d..bc9a1f9 100644 (file)
--- a/fuel/deploy/templates/virtual_environment/conf/dea.yaml
+++ b/fuel/deploy/templates/virtual_environment/conf/dea.yaml
@@ -663,13 +663,13 @@ settings:
         - name: ubuntu-updates
           priority: null
           section: main
-          suite: trusty-updates
+          suite: trusty
           type: deb
           uri: http://10.20.0.2:8080/ubuntu-part
         - name: ubuntu-security
           priority: null
           section: main
-          suite: trusty-security
+          suite: trusty
           type: deb
           uri: http://10.20.0.2:8080/ubuntu-part
         - name: mos