From 10361fd56fac5f7aebba44402bf9a501854d00c3 Mon Sep 17 00:00:00 2001
From: Yifei Xue <xueyifei@huawei.com>
Date: Wed, 1 Nov 2017 11:46:18 +0800
Subject: Upgrade OpenStack version from Ocata to Pike

JIRA: COMPASS-565

For OPNFV F release, it's going to use OpenStack Pike as the NFVI
component. This task is created to monitor the upgrade work of
OpenStack Pike. Subtasks as follow:
- Add Pike related configurations to compass_conf
- Upgrade ubuntu os to ubuntu 16.04.3
- Upgrade centos os to centos 7.4
- Upgrade openstack-ansible from ocata to pike
- Upgrade openstack repos from ocata to pike

Change-Id: I2202e8e3ae23dae8e575c89170c9e5e057757870
Signed-off-by: Yifei Xue <xueyifei@huawei.com>
---
 .../roles/config-controller/tasks/RedHat.yml       | 30 +++++++++++-----------
 .../ansible/roles/config-controller/tasks/main.yml |  4 +++
 2 files changed, 19 insertions(+), 15 deletions(-)

(limited to 'deploy/adapters/ansible/roles/config-controller/tasks')

diff --git a/deploy/adapters/ansible/roles/config-controller/tasks/RedHat.yml b/deploy/adapters/ansible/roles/config-controller/tasks/RedHat.yml
index 728dc559..cc14347a 100644
--- a/deploy/adapters/ansible/roles/config-controller/tasks/RedHat.yml
+++ b/deploy/adapters/ansible/roles/config-controller/tasks/RedHat.yml
@@ -8,30 +8,30 @@
 ##############################################################################
 ---
 # yamllint disable rule:line-length
-- name: generate vxlan vlan ifcfg-if script
+- name: generate tenant vlan ifcfg-if script
   template:
-    src: ifcfg-if.vxlan
-    dest: /etc/sysconfig/network-scripts/ifcfg-{{sys_intf_mappings["mgmt"]["interface"]}}.{{sys_intf_mappings["mgmt"]["vlan_tag"]}}
+    src: ifcfg-if.tenant
+    dest: /etc/sysconfig/network-scripts/ifcfg-{{contr_sys_mappings["tenant"]["interface"]}}.{{contr_sys_mappings["tenant"]["vlan_tag"]}}
 
 - name: generate storage vlan ifcfg-if script
   template:
     src: ifcfg-if.storage
-    dest: /etc/sysconfig/network-scripts/ifcfg-{{sys_intf_mappings["storage"]["interface"]}}.{{sys_intf_mappings["storage"]["vlan_tag"]}}
+    dest: /etc/sysconfig/network-scripts/ifcfg-{{contr_sys_mappings["storage"]["interface"]}}.{{contr_sys_mappings["storage"]["vlan_tag"]}}
 
-- name: add br-vlan to interface script
+- name: add br-external to interface script
   lineinfile:
-    dest: /etc/sysconfig/network-scripts/ifcfg-{{ network_cfg["provider_net_mappings"][0]["interface"] }}
-    line: "BRIDGE=br-vlan"
+    dest: /etc/sysconfig/network-scripts/ifcfg-{{contr_sys_mappings["external"]["interface"]}}
+    line: "BRIDGE=br-external"
 
 - name: add br-storage to interface script
   lineinfile:
-    dest: /etc/sysconfig/network-scripts/ifcfg-{{sys_intf_mappings["storage"]["interface"]}}.{{sys_intf_mappings["storage"]["vlan_tag"]}}
+    dest: /etc/sysconfig/network-scripts/ifcfg-{{contr_sys_mappings["storage"]["interface"]}}.{{contr_sys_mappings["storage"]["vlan_tag"]}}
     line: "BRIDGE=br-storage"
 
-- name: add br-vxlan to interface script
+- name: add br-tenant to interface script
   lineinfile:
-    dest: /etc/sysconfig/network-scripts/ifcfg-{{sys_intf_mappings["mgmt"]["interface"]}}.{{sys_intf_mappings["mgmt"]["vlan_tag"]}}
-    line: "BRIDGE=br-vxlan"
+    dest: /etc/sysconfig/network-scripts/ifcfg-{{contr_sys_mappings["tenant"]["interface"]}}.{{contr_sys_mappings["tenant"]["vlan_tag"]}}
+    line: "BRIDGE=br-tenant"
 # yamllint enable rule:line-length
 
 - name: remove eth0 ip addresss
@@ -56,9 +56,9 @@
     src: ifcfg-br-mgmt
     dest: /etc/sysconfig/network-scripts/
 
-- name: generate ifcfg-br-vlan script
+- name: generate ifcfg-br-external script
   template:
-    src: ifcfg-br-vlan
+    src: ifcfg-br-external
     dest: /etc/sysconfig/network-scripts/
 
 - name: generate ifcfg-br-storag script
@@ -66,9 +66,9 @@
     src: ifcfg-br-storage
     dest: /etc/sysconfig/network-scripts/
 
-- name: generate ifcfg-br-vxlan script
+- name: generate ifcfg-br-tenant script
   template:
-    src: ifcfg-br-vxlan
+    src: ifcfg-br-tenant
     dest: /etc/sysconfig/network-scripts/
 
 - name: restart the network
diff --git a/deploy/adapters/ansible/roles/config-controller/tasks/main.yml b/deploy/adapters/ansible/roles/config-controller/tasks/main.yml
index 674c80cc..9f390307 100644
--- a/deploy/adapters/ansible/roles/config-controller/tasks/main.yml
+++ b/deploy/adapters/ansible/roles/config-controller/tasks/main.yml
@@ -12,3 +12,7 @@
 
 - include: "{{ ansible_os_family }}.yml"
   when: ansible_os_family == 'RedHat' and ansible_distribution_major_version == '7'
+
+- name: set fact for local mirror
+  set_fact:
+    local_mirror: "{{ ansible_distribution }}"
-- 
cgit 1.2.3-korg