summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSzilard Cserey <szilard.cserey@ericsson.com>2015-11-10 19:51:48 +0000
committerGerrit Code Review <gerrit@172.30.200.206>2015-11-10 19:51:49 +0000
commit6794ccd3a7fc05db0609c74510a9c8c123630ec1 (patch)
tree7080dabad480fe460cfc3d0b9ddac8b237a95df1
parent2c510f0a0d6b797517b768cf767bc4a2bcfb363f (diff)
parent732f0dc2d91021fe5bcab337d4f5dd82c582ce34 (diff)
Merge "FIX for ODL tzdata dependency issue suggested by Michal Skalski"
-rw-r--r--fuel/deploy/templates/hardware_environment/conf/ericsson_montreal_lab/dea.yaml16
-rw-r--r--fuel/deploy/templates/hardware_environment/conf/linux_foundation_lab/pod1/dea.yaml18
-rw-r--r--fuel/deploy/templates/hardware_environment/conf/linux_foundation_lab/pod2/dea.yaml16
-rw-r--r--fuel/deploy/templates/hardware_environment/conf/opnfv_box/dea.yaml16
-rw-r--r--fuel/deploy/templates/virtual_environment/conf/dea.yaml16
5 files changed, 41 insertions, 41 deletions
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 b4e2f6bfb..67fba4f66 100644
--- 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 818030878..b7404c95c 100644
--- 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 dafce1051..9701e565a 100644
--- 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 4966bf09e..39a3a3192 100644
--- 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 584a61e42..8db0ccd57 100644
--- 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