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>

6 files changed, 10 insertions, 12 deletions

diff --git a/plugins/odl_cluster/roles/setup-odl/tasks/control-agents-1.yml b/plugins/odl_cluster/roles/setup-odl/tasks/control-agents-1.yml
index 684f314c..13b4c571 100755
--- a/plugins/odl_cluster/roles/setup-odl/tasks/control-agents-1.yml
+++ b/plugins/odl_cluster/roles/setup-odl/tasks/control-agents-1.yml
@@ -8,7 +8,7 @@
 - name: install networking-odl
   pip:
     name: networking-odl
-    virtualenv: /openstack/venvs/neutron-15.1.4
+    virtualenv: /openstack/venvs/neutron-{{ os_ver }}
 
 - name: configure vsctl for dhcp agent
   shell: |
diff --git a/plugins/odl_cluster/roles/setup-odl/tasks/control-agents-2.yml b/plugins/odl_cluster/roles/setup-odl/tasks/control-agents-2.yml
index 82a26005..39b501db 100755
--- a/plugins/odl_cluster/roles/setup-odl/tasks/control-agents-2.yml
+++ b/plugins/odl_cluster/roles/setup-odl/tasks/control-agents-2.yml
@@ -70,7 +70,7 @@
 
 - name: Set host OVS configurations
   command: |
-    /openstack/venvs/neutron-15.1.4/bin/neutron-odl-ovs-hostconfig \
+    /openstack/venvs/neutron-{{ os_ver }}/bin/neutron-odl-ovs-hostconfig \
             --datapath_type=system --bridge_mappings={{ contr_l2_mappings }}
   when:
     - inventory_hostname not in groups['nova_compute']
@@ -78,7 +78,7 @@
 
 - name: Set host OVS configurations
   command: |
-    /openstack/venvs/neutron-15.1.4/bin/neutron-odl-ovs-hostconfig \
+    /openstack/venvs/neutron-{{ os_ver }}/bin/neutron-odl-ovs-hostconfig \
             --datapath_type=system --bridge_mappings={{ contr_l3_mappings }}
   when:
     - inventory_hostname not in groups['nova_compute']
@@ -86,14 +86,14 @@
 
 - name: Set host OVS configurations
   command: |
-    /openstack/venvs/neutron-15.1.4/bin/neutron-odl-ovs-hostconfig --datapath_type=system
+    /openstack/venvs/neutron-{{ os_ver }}/bin/neutron-odl-ovs-hostconfig --datapath_type=system
   when:
     - inventory_hostname in groups['nova_compute']
     - odl_l3_agent == "Disable"
 
 - name: Set host OVS configurations
   command: |
-    /openstack/venvs/neutron-15.1.4/bin/neutron-odl-ovs-hostconfig
+    /openstack/venvs/neutron-{{ os_ver }}/bin/neutron-odl-ovs-hostconfig
             --datapath_type=system --bridge_mappings={{ compu_l3_mappings }}
   when:
     - inventory_hostname in groups['nova_compute']
diff --git a/plugins/odl_cluster/roles/setup-odl/tasks/control-repos-1.yml b/plugins/odl_cluster/roles/setup-odl/tasks/control-repos-1.yml
index 7b699a35..0eacde6e 100755
--- a/plugins/odl_cluster/roles/setup-odl/tasks/control-repos-1.yml
+++ b/plugins/odl_cluster/roles/setup-odl/tasks/control-repos-1.yml
@@ -1,7 +1,7 @@
 ---
 - name: copy download script
-  copy:
-    src: odl_pkg.sh
+  template:
+    src: odl_pkg.sh.j2
     dest: /opt/odl_pkg.sh
     mode: 0777
 
diff --git a/plugins/odl_cluster/roles/setup-odl/tasks/control-servers-1.yml b/plugins/odl_cluster/roles/setup-odl/tasks/control-servers-1.yml
index f6f73684..060abfc6 100755
--- a/plugins/odl_cluster/roles/setup-odl/tasks/control-servers-1.yml
+++ b/plugins/odl_cluster/roles/setup-odl/tasks/control-servers-1.yml
@@ -8,7 +8,7 @@
 - name: install networking-odl
   pip:
     name: networking-odl
-    virtualenv: /openstack/venvs/neutron-15.1.4    # Todo: hardcode, need to modify
+    virtualenv: /openstack/venvs/neutron-{{ os_ver }}
 
 - name: turn off neutron-server on control node
   service: name=neutron-server state=stopped
diff --git a/plugins/odl_cluster/roles/setup-odl/tasks/control-servers-3.yml b/plugins/odl_cluster/roles/setup-odl/tasks/control-servers-3.yml
index 3d5c307b..ced011bd 100755
--- a/plugins/odl_cluster/roles/setup-odl/tasks/control-servers-3.yml
+++ b/plugins/odl_cluster/roles/setup-odl/tasks/control-servers-3.yml
@@ -2,7 +2,7 @@
 
 - name: Perform a Neutron DB online upgrade
   command: |
-    /openstack/venvs/neutron-15.1.4/bin/neutron-db-manage
+    /openstack/venvs/neutron-{{ os_ver }}/bin/neutron-db-manage
                       --config-file /etc/neutron/neutron.conf
                       --config-file /etc/neutron/plugins/ml2/ml2_conf.ini
                       upgrade --expand
@@ -11,7 +11,7 @@
 
 - name: Perform a Neutron DB offline upgrade
   command: |
-    /openstack/venvs/neutron-15.1.4/bin/neutron-db-manage
+    /openstack/venvs/neutron-{{ os_ver }}/bin/neutron-db-manage
                       --config-file /etc/neutron/neutron.conf
                       --config-file /etc/neutron/plugins/ml2/ml2_conf.ini
                       upgrade --contract
diff --git a/plugins/odl_cluster/roles/setup-odl/tasks/odl-cluster.yml b/plugins/odl_cluster/roles/setup-odl/tasks/odl-cluster.yml
index 8cd12da8..e32f2542 100755
--- a/plugins/odl_cluster/roles/setup-odl/tasks/odl-cluster.yml
+++ b/plugins/odl_cluster/roles/setup-odl/tasks/odl-cluster.yml
@@ -13,8 +13,6 @@
   when: inventory_hostname in groups['network_hosts']     # Todo: modify to odl_hosts
 
 - include: control-repos-1.yml
-  vars:
-    odl_pip: "{{ networking_odl_url }}"
   when: inventory_hostname == groups['repo_container'][0]
 
 - include: control-servers-1.yml