Merge "Adopt infra_deploy to spawn VM on LTS Ubuntu 18"

4 files changed, 61 insertions, 2 deletions

diff --git a/ansible/infra_deploy.yml b/ansible/infra_deploy.yml
index 8cf5dffef..4a5716eee 100644
--- a/ansible/infra_deploy.yml
+++ b/ansible/infra_deploy.yml
@@ -27,6 +27,7 @@
       proxy_host_ip: "{{ lookup('dig', proxy_host) }}"
 
   roles:
+    - infra_install_dependencies
     - infra_destroy_previous_configuration
     - infra_check_requirements
     - infra_create_network
diff --git a/ansible/roles/infra_create_vms/tasks/create_interfaces.yml b/ansible/roles/infra_create_vms/tasks/create_interfaces.yml
index 34bfd1b71..12b2726dc 100644
--- a/ansible/roles/infra_create_vms/tasks/create_interfaces.yml
+++ b/ansible/roles/infra_create_vms/tasks/create_interfaces.yml
@@ -12,6 +12,15 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 ---
+- set_fact:
+    mac_address_arg: "mac_address"
+
+- set_fact:
+    mac_address_arg: "macaddress"
+  when:
+    - ansible_distribution == 'Ubuntu'
+    - ansible_distribution_major_version|int >= 18
+
 - name: Add network-data
   blockinfile:
     path: "{{ network_config }}"
@@ -20,9 +29,9 @@
     block: |2
         {{ 'enp0s%d:'| format( slot_address | int) }}
           match:
-            mac_address: {{ '52:54:00:5d:7d:%02x'| format( mac_address_counter | int) }}
+            {{ mac_address_arg }}: {{ '52:54:00:5d:7d:%02x'| format( mac_address_counter | int) }}
           addresses:
-            - {{ interface_item.ip }}/{{ interface_item.netmask }}
+            - {{ interface_item.ip }}/{{ (interface_item.ip + '/' + interface_item.netmask) | ipaddr('prefix') }}
 
 - name: Add default gateway
   blockinfile:
diff --git a/ansible/roles/infra_install_dependencies/tasks/Debian.yml b/ansible/roles/infra_install_dependencies/tasks/Debian.yml
new file mode 100644
index 000000000..9f4dc1046
--- /dev/null
+++ b/ansible/roles/infra_install_dependencies/tasks/Debian.yml
@@ -0,0 +1,34 @@
+# Copyright (c) 2018 Intel Corporation.

+#

+# Licensed under the Apache License, Version 2.0 (the "License");

+# you may not use this file except in compliance with the License.

+# You may obtain a copy of the License at

+#

+#      http://www.apache.org/licenses/LICENSE-2.0

+#

+# Unless required by applicable law or agreed to in writing, software

+# distributed under the License is distributed on an "AS IS" BASIS,

+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

+# See the License for the specific language governing permissions and

+# limitations under the License.

+---

+- name: Update repositories

+  apt:

+    update_cache: yes

+

+- name: Install core packages

+  action: "{{ ansible_pkg_mgr }} name={{ item }} state=present"

+  with_items:

+    - python-libvirt

+    - genisoimage

+  when: ansible_distribution_major_version|int == 16

+

+- name: Install core packages

+  action: "{{ ansible_pkg_mgr }} name={{ item }} state=present"

+  with_items:

+    - python-pip

+    - python-libvirt

+    - python-lxml

+    - python-netaddr

+    - genisoimage

+  when: ansible_distribution_major_version|int >= 18

diff --git a/ansible/roles/infra_install_dependencies/tasks/main.yml b/ansible/roles/infra_install_dependencies/tasks/main.yml
new file mode 100644
index 000000000..115b1e3b9
--- /dev/null
+++ b/ansible/roles/infra_install_dependencies/tasks/main.yml
@@ -0,0 +1,15 @@
+# Copyright (c) 2018 Intel Corporation.

+#

+# Licensed under the Apache License, Version 2.0 (the "License");

+# you may not use this file except in compliance with the License.

+# You may obtain a copy of the License at

+#

+#      http://www.apache.org/licenses/LICENSE-2.0

+#

+# Unless required by applicable law or agreed to in writing, software

+# distributed under the License is distributed on an "AS IS" BASIS,

+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

+# See the License for the specific language governing permissions and

+# limitations under the License.

+---

+- include_tasks: "{{ ansible_os_family }}.yml"