CORD-382 updated compute node provisioning so that the specification of fabric NIC identification is passed on
Change-Id: Ibf596d610f5420f9a9ead7ce3a6f93d022ad85ac
(cherry picked from commit 2e76f122660da12e5fdad5d58be52d9d4fe871c3)
diff --git a/roles/head-node/files/compute-node-vars.yml b/roles/head-node/files/compute-node-vars.yml
new file mode 100644
index 0000000..4991bbb
--- /dev/null
+++ b/roles/head-node/files/compute-node-vars.yml
@@ -0,0 +1 @@
+fabric_iface_spec: '{{ compute_node.fabric_iface_match }}'
diff --git a/roles/head-node/files/compute-node.yml b/roles/head-node/files/compute-node.yml
index 7fb41f0..94aac38 100644
--- a/roles/head-node/files/compute-node.yml
+++ b/roles/head-node/files/compute-node.yml
@@ -1,4 +1,12 @@
-- hosts: all
+---
+- name: Include vars
+ hosts: all
+ tasks:
+ - include_vars: vars/compute-node.yml
+
+- name: Configure compute hosts to use DNS server
+ hosts: all
remote_user: ubuntu
+ become: yes
roles:
- - compute-node
+ - role: compute-node
diff --git a/roles/head-node/tasks/main.yml b/roles/head-node/tasks/main.yml
index d8067d0..18b9b93 100644
--- a/roles/head-node/tasks/main.yml
+++ b/roles/head-node/tasks/main.yml
@@ -66,6 +66,24 @@
- compute-node.yml
- switch-node.yml
+- name: Ensure Compute and Switch Variable Directory
+ become: yes
+ file:
+ path=/etc/maas/ansible/vars
+ owner=maas
+ group=maas
+ mode=0755
+ state=directory
+
+- name: Ensure Compute and Switch Node Variables
+ become: yes
+ template:
+ src=files/compute-node-vars.yml
+ dest=/etc/maas/ansible/vars/compute-node.yml
+ owner=maas
+ group=maas
+ mode=0644
+
- name: Ensure Connect Switch Ansible Playbook
become: yes
copy: