From e15470816ebaeb7ccd9a90d9077b310703906e46 Mon Sep 17 00:00:00 2001 From: "wu.zhihui" Date: Thu, 17 Nov 2016 17:13:57 +0800 Subject: Update repos url - ubuntu version: trusty -> xenial - mos and Auxiliary version: mitaka9.0 -> newton10.0 Change-Id: Ifa11140d6afe71c9d996cab786e97ad004e1bac4 Signed-off-by: wu.zhihui --- labs/zte/pod1/fuel/config/dea-pod-override.yaml | 16 ++++++++-------- labs/zte/pod2/fuel/config/dea-pod-override.yaml | 16 ++++++++-------- labs/zte/pod3/fuel/config/dea-pod-override.yaml | 24 ++++++++++++------------ 3 files changed, 28 insertions(+), 28 deletions(-) diff --git a/labs/zte/pod1/fuel/config/dea-pod-override.yaml b/labs/zte/pod1/fuel/config/dea-pod-override.yaml index f5f8bb6..071300f 100644 --- a/labs/zte/pod1/fuel/config/dea-pod-override.yaml +++ b/labs/zte/pod1/fuel/config/dea-pod-override.yaml @@ -68,7 +68,7 @@ network: base_mac: fa:16:3e:00:00:00 configuration_template: null dns_nameservers: - - 172.60.0.1 + - 172.10.0.1 floating_name: admin_floating_net floating_ranges: - - 172.60.0.130 @@ -201,7 +201,7 @@ settings: 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: 172.60.0.1 + value: 172.10.0.1 weight: 10 metadata: group: network @@ -303,30 +303,30 @@ settings: - name: ubuntu priority: null section: main universe multiverse - suite: trusty + suite: xenial type: deb uri: http://10.20.6.2:8080/mirrors/ubuntu/ - name: ubuntu-updates priority: null section: main universe multiverse - suite: trusty-updates + suite: xenial-updates type: deb uri: http://10.20.6.2:8080/mirrors/ubuntu/ - name: ubuntu-security priority: null section: main universe multiverse - suite: trusty-security + suite: xenial-security type: deb uri: http://10.20.6.2:8080/mirrors/ubuntu/ - name: mos priority: 1050 section: main restricted - suite: mos9.0 + suite: mos10.0 type: deb - uri: http://10.20.6.2:8080/mitaka-9.0/ubuntu/x86_64 + uri: http://10.20.6.2:8080/newton-10.0/ubuntu/x86_64 - name: Auxiliary priority: 1150 section: main restricted suite: auxiliary type: deb - uri: http://10.20.6.2:8080/mitaka-9.0/ubuntu/auxiliary + uri: http://10.20.6.2:8080/newton-10.0/ubuntu/auxiliary diff --git a/labs/zte/pod2/fuel/config/dea-pod-override.yaml b/labs/zte/pod2/fuel/config/dea-pod-override.yaml index 385c9c6..67d547c 100644 --- a/labs/zte/pod2/fuel/config/dea-pod-override.yaml +++ b/labs/zte/pod2/fuel/config/dea-pod-override.yaml @@ -68,7 +68,7 @@ network: base_mac: fa:16:3e:00:00:00 configuration_template: null dns_nameservers: - - 172.70.0.1 + - 172.10.0.1 floating_name: admin_floating_net floating_ranges: - - 172.70.0.130 @@ -201,7 +201,7 @@ settings: 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: 172.70.0.1 + value: 172.10.0.1 weight: 10 metadata: group: network @@ -303,31 +303,31 @@ settings: - name: ubuntu priority: null section: main universe multiverse - suite: trusty + suite: xenial type: deb uri: http://10.20.7.2:8080/mirrors/ubuntu/ - name: ubuntu-updates priority: null section: main universe multiverse - suite: trusty-updates + suite: xenial-updates type: deb uri: http://10.20.7.2:8080/mirrors/ubuntu/ - name: ubuntu-security priority: null section: main universe multiverse - suite: trusty-security + suite: xenial-security type: deb uri: http://10.20.7.2:8080/mirrors/ubuntu/ - name: mos priority: 1050 section: main restricted - suite: mos9.0 + suite: mos10.0 type: deb - uri: http://10.20.7.2:8080/mitaka-9.0/ubuntu/x86_64 + uri: http://10.20.7.2:8080/newton-10.0/ubuntu/x86_64 - name: Auxiliary priority: 1150 section: main restricted suite: auxiliary type: deb - uri: http://10.20.7.2:8080/mitaka-9.0/ubuntu/auxiliary + uri: http://10.20.7.2:8080/newton-10.0/ubuntu/auxiliary diff --git a/labs/zte/pod3/fuel/config/dea-pod-override.yaml b/labs/zte/pod3/fuel/config/dea-pod-override.yaml index 171a093..b93bb5f 100644 --- a/labs/zte/pod3/fuel/config/dea-pod-override.yaml +++ b/labs/zte/pod3/fuel/config/dea-pod-override.yaml @@ -281,51 +281,51 @@ settings: - name: ubuntu priority: null section: main universe multiverse - suite: trusty + suite: xenial type: deb uri: http://10.20.0.2:8080/mirrors/ubuntu/ - name: ubuntu-updates priority: null section: main universe multiverse - suite: trusty-updates + suite: xenial-updates type: deb uri: http://10.20.0.2:8080/mirrors/ubuntu/ - name: ubuntu-security priority: null section: main universe multiverse - suite: trusty-security + suite: xenial-security type: deb uri: http://10.20.0.2:8080/mirrors/ubuntu/ - name: mos priority: 1050 section: main restricted - suite: mos9.0 + suite: mos10.0 type: deb - uri: http://10.20.0.2:8080/mitaka-9.0/ubuntu/x86_64 + uri: http://10.20.0.2:8080/newton-10.0/ubuntu/x86_64 - name: mos-updates priority: 1050 section: main restricted - suite: mos9.0-updates + suite: mos10.0-updates type: deb - uri: http://10.20.0.202/mirrors/mos-repos/ubuntu/9.0/ + uri: http://10.20.0.202/mirrors/mos-repos/ubuntu/10.0/ - name: mos-security priority: 1050 section: main restricted - suite: mos9.0-security + suite: mos10.0-security type: deb - uri: http://10.20.0.202/mirrors/mos-repos/ubuntu/9.0/ + uri: http://10.20.0.202/mirrors/mos-repos/ubuntu/10.0/ - name: mos-holdback priority: 1100 section: main restricted - suite: mos9.0-holdback + suite: mos10.0-holdback type: deb - uri: http://10.20.0.202/mirrors/mos-repos/ubuntu/9.0/ + uri: http://10.20.0.202/mirrors/mos-repos/ubuntu/10.0/ - name: Auxiliary priority: 1150 section: main restricted suite: auxiliary type: deb - uri: http://10.20.0.2:8080/mitaka-9.0/ubuntu/auxiliary + uri: http://10.20.0.2:8080/newton-10.0/ubuntu/auxiliary storage: ephemeral_ceph: description: Configures Nova to store ephemeral volumes in RBD. This works -- cgit 1.2.3-korg