FIX for ODL tzdata dependency issue suggested by Michal Skalski

Change-Id: Ia2b5e69318788a2c8c1c061ce9cc14cd3c020397
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 b4e2f6b..67fba4f 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
@@ -609,49 +609,49 @@ settings:
         type: custom_repo_configuration
         value:
         - name: ubuntu
-          priority: null
+          priority: 2000
           section: main
           suite: trusty
           type: deb
           uri: http://10.20.0.2:8080/ubuntu-part
         - name: ubuntu-updates
-          priority: null
+          priority: 2000
           section: main
           suite: trusty
           type: deb
           uri: http://10.20.0.2:8080/ubuntu-part
         - name: ubuntu-security
-          priority: null
+          priority: 2000
           section: main
           suite: trusty
           type: deb
           uri: http://10.20.0.2:8080/ubuntu-part
         - name: mos
-          priority: 1050
+          priority: 2050
           section: main restricted
           suite: mos6.1
           type: deb
           uri: http://10.20.0.2:8080/2014.2.2-6.1/ubuntu/x86_64
         - name: mos-updates
-          priority: 1050
+          priority: 2050
           section: main restricted
           suite: mos6.1-updates
           type: deb
           uri: http://10.20.0.2:8080/mos-ubuntu
         - name: mos-security
-          priority: 1050
+          priority: 2050
           section: main restricted
           suite: mos6.1-security
           type: deb
           uri: http://10.20.0.2:8080/mos-ubuntu
         - name: mos-holdback
-          priority: 1100
+          priority: 2100
           section: main restricted
           suite: mos6.1-holdback
           type: deb
           uri: http://10.20.0.2:8080/mos-ubuntu
         - name: Auxiliary
-          priority: 1150
+          priority: 2150
           section: main restricted
           suite: auxiliary
           type: deb

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 8180308..b7404c9 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
@@ -606,49 +606,49 @@ settings:
         type: custom_repo_configuration
         value:
         - name: ubuntu
-          priority: null
+          priority: 2000
           section: main
           suite: trusty
           type: deb
           uri: http://10.20.0.2:8080/ubuntu-part
         - name: ubuntu-updates
-          priority: null
+          priority: 2000
           section: main
           suite: trusty
           type: deb
           uri: http://10.20.0.2:8080/ubuntu-part
         - name: ubuntu-security
-          priority: null
+          priority: 2000
           section: main
           suite: trusty
           type: deb
           uri: http://10.20.0.2:8080/ubuntu-part
         - name: mos
-          priority: 1050
+          priority: 2050
           section: main restricted
           suite: mos6.1
           type: deb
           uri: http://10.20.0.2:8080/2014.2.2-6.1/ubuntu/x86_64
         - name: mos-updates
-          priority: 1050
+          priority: 2050
           section: main restricted
           suite: mos6.1-updates
           type: deb
           uri: http://10.20.0.2:8080/mos-ubuntu
         - name: mos-security
-          priority: 1050
+          priority: 2050
           section: main restricted
           suite: mos6.1-security
           type: deb
-          uri: hhttp://10.20.0.2:8080/mos-ubuntu
+          uri: http://10.20.0.2:8080/mos-ubuntu
         - name: mos-holdback
-          priority: 1100
+          priority: 2100
           section: main restricted
           suite: mos6.1-holdback
           type: deb
           uri: http://10.20.0.2:8080/mos-ubuntu
         - name: Auxiliary
-          priority: 1150
+          priority: 2150
           section: main restricted
           suite: auxiliary
           type: deb

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 dafce10..9701e56 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
@@ -606,49 +606,49 @@ settings:
         type: custom_repo_configuration
         value:
         - name: ubuntu
-          priority: null
+          priority: 2000
           section: main
           suite: trusty
           type: deb
           uri: http://10.20.0.2:8080/ubuntu-part
         - name: ubuntu-updates
-          priority: null
+          priority: 2000
           section: main
           suite: trusty
           type: deb
           uri: http://10.20.0.2:8080/ubuntu-part
         - name: ubuntu-security
-          priority: null
+          priority: 2000
           section: main
           suite: trusty
           type: deb
           uri: http://10.20.0.2:8080/ubuntu-part
         - name: mos
-          priority: 1050
+          priority: 2050
           section: main restricted
           suite: mos6.1
           type: deb
           uri: http://10.20.0.2:8080/2014.2.2-6.1/ubuntu/x86_64
         - name: mos-updates
-          priority: 1050
+          priority: 2050
           section: main restricted
           suite: mos6.1-updates
           type: deb
           uri: http://10.20.0.2:8080/mos-ubuntu
         - name: mos-security
-          priority: 1050
+          priority: 2050
           section: main restricted
           suite: mos6.1-security
           type: deb
           uri: http://10.20.0.2:8080/mos-ubuntu
         - name: mos-holdback
-          priority: 1100
+          priority: 2100
           section: main restricted
           suite: mos6.1-holdback
           type: deb
           uri: http://10.20.0.2:8080/mos-ubuntu
         - name: Auxiliary
-          priority: 1150
+          priority: 2150
           section: main restricted
           suite: auxiliary
           type: deb

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 4966bf0..39a3a31 100644 (file)
--- a/fuel/deploy/templates/hardware_environment/conf/opnfv_box/dea.yaml
+++ b/fuel/deploy/templates/hardware_environment/conf/opnfv_box/dea.yaml
@@ -607,49 +607,49 @@ settings:
         type: custom_repo_configuration
         value:
         - name: ubuntu
-          priority: null
+          priority: 2000
           section: main
           suite: trusty
           type: deb
           uri: http://10.20.0.2:8080/ubuntu-part
         - name: ubuntu-updates
-          priority: null
+          priority: 2000
           section: main
           suite: trusty
           type: deb
           uri: http://10.20.0.2:8080/ubuntu-part
         - name: ubuntu-security
-          priority: null
+          priority: 2000
           section: main
           suite: trusty
           type: deb
           uri: http://10.20.0.2:8080/ubuntu-part
         - name: mos
-          priority: 1050
+          priority: 2050
           section: main restricted
           suite: mos6.1
           type: deb
           uri: http://10.20.0.2:8080/2014.2.2-6.1/ubuntu/x86_64
         - name: mos-updates
-          priority: 1050
+          priority: 2050
           section: main restricted
           suite: mos6.1-updates
           type: deb
           uri: http://10.20.0.2:8080/mos-ubuntu
         - name: mos-security
-          priority: 1050
+          priority: 2050
           section: main restricted
           suite: mos6.1-security
           type: deb
           uri: http://10.20.0.2:8080/mos-ubuntu
         - name: mos-holdback
-          priority: 1100
+          priority: 2100
           section: main restricted
           suite: mos6.1-holdback
           type: deb
           uri: http://10.20.0.2:8080/mos-ubuntu
         - name: Auxiliary
-          priority: 1150
+          priority: 2150
           section: main restricted
           suite: auxiliary
           type: deb

diff --git a/fuel/deploy/templates/virtual_environment/conf/dea.yaml b/fuel/deploy/templates/virtual_environment/conf/dea.yaml
index 584a61e..8db0ccd 100644 (file)
--- a/fuel/deploy/templates/virtual_environment/conf/dea.yaml
+++ b/fuel/deploy/templates/virtual_environment/conf/dea.yaml
@@ -603,49 +603,49 @@ settings:
         type: custom_repo_configuration
         value:
         - name: ubuntu
-          priority: null
+          priority: 2000
           section: main
           suite: trusty
           type: deb
           uri: http://10.20.0.2:8080/ubuntu-part
         - name: ubuntu-updates
-          priority: null
+          priority: 2000
           section: main
           suite: trusty
           type: deb
           uri: http://10.20.0.2:8080/ubuntu-part
         - name: ubuntu-security
-          priority: null
+          priority: 2000
           section: main
           suite: trusty
           type: deb
           uri: http://10.20.0.2:8080/ubuntu-part
         - name: mos
-          priority: 1050
+          priority: 2050
           section: main restricted
           suite: mos6.1
           type: deb
           uri: http://10.20.0.2:8080/2014.2.2-6.1/ubuntu/x86_64
         - name: mos-updates
-          priority: 1050
+          priority: 2050
           section: main restricted
           suite: mos6.1-updates
           type: deb
           uri: http://10.20.0.2:8080/mos-ubuntu
         - name: mos-security
-          priority: 1050
+          priority: 2050
           section: main restricted
           suite: mos6.1-security
           type: deb
           uri: http://10.20.0.2:8080/mos-ubuntu
         - name: mos-holdback
-          priority: 1100
+          priority: 2100
           section: main restricted
           suite: mos6.1-holdback
           type: deb
           uri: http://10.20.0.2:8080/mos-ubuntu
         - name: Auxiliary
-          priority: 1150
+          priority: 2150
           section: main restricted
           suite: auxiliary
           type: deb