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>
---
 .../ansible/roles/config-osa/tasks/main.yml        | 23 +++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

(limited to 'deploy/adapters/ansible/roles/config-osa/tasks/main.yml')

diff --git a/deploy/adapters/ansible/roles/config-osa/tasks/main.yml b/deploy/adapters/ansible/roles/config-osa/tasks/main.yml
index d96a83da..2f6186fc 100755
--- a/deploy/adapters/ansible/roles/config-osa/tasks/main.yml
+++ b/deploy/adapters/ansible/roles/config-osa/tasks/main.yml
@@ -34,6 +34,7 @@
   register: checkresult
   ignore_errors: "true"
 
+# yamllint disable rule:line-length
 - name: add mariadb local repository
   blockinfile:
     dest: /etc/openstack_deploy/user_variables.yml
@@ -44,8 +45,8 @@
   when:
     - checkresult.rc == 0
     - offline_deployment is defined and offline_deployment == "Disable"
+    - hostvars[hostvars[inventory_hostname]['groups']['controller'][0]]['local_mirror'] == 'Ubuntu'
 
-# yamllint disable rule:line-length
 - name: add mariadb local repository
   blockinfile:
     dest: /etc/openstack_deploy/user_variables.yml
@@ -96,7 +97,7 @@
 
 - name: remove repo_build_pip_no_binary
   lineinfile:
-    dest: /opt/openstack-ansible/playbooks/inventory/group_vars/repo_all.yml
+    dest: /opt/openstack-ansible/group_vars/repo_all.yml
     state: absent
     regexp: "{{ item }}"
   with_items: ['^repo_build_pip_no_binary:', '^  - libvirt-python']
@@ -139,10 +140,10 @@
   when: offline_deployment is defined and offline_deployment == "Enable"
 
 # This is a bug in ocata, will be removed in the future
-- name: limit the version of networking-sfc in os_tacker
-  shell: |
-    sed -i 's/networking-sfc$/networking-sfc=={{ networking_sfc_version }}/g' \
-        /etc/ansible/roles/os_tacker/defaults/main.yml
+# - name: limit the version of networking-sfc in os_tacker
+#  shell: |
+#    sed -i 's/networking-sfc$/networking-sfc=={{ networking_sfc_version }}/g' \
+#        /etc/ansible/roles/os_tacker/defaults/main.yml
 
 - name: add rally and tempest to requirement.txt
   blockinfile:
@@ -270,10 +271,10 @@
     src: repo_fix_pandas.yml
     dest: /etc/ansible/roles/repo_build/tasks/repo_fix_pandas.yml
 
-- name: change repore build
-  lineinfile:
-    dest: /etc/ansible/roles/repo_build/tasks/main.yml
-    insertafter: "^- include: repo_post_build.yml"
-    line: "- include: repo_fix_pandas.yml"
+# - name: change repore build
+#  lineinfile:
+#    dest: /etc/ansible/roles/repo_build/tasks/main.yml
+#    insertafter: "^- include: repo_post_build.yml"
+#    line: "- include: repo_fix_pandas.yml"
 
 - include: meters.yml
-- 
cgit 1.2.3-korg