Change var name: cord_provisioned -> on_maas
Change-Id: I046224d3e3297e551f596509367ac39a65fa7fb1
diff --git a/cord-compute-playbook.yml b/cord-compute-playbook.yml
index 0176226..6461e1f 100644
--- a/cord-compute-playbook.yml
+++ b/cord-compute-playbook.yml
@@ -12,7 +12,7 @@
hosts: all
become: yes
roles:
- - { role: dns-configure, when: not cord_provisioned }
+ - { role: dns-configure, when: not on_maas }
- name: Prep systems
hosts: compute
diff --git a/cord-head-playbook.yml b/cord-head-playbook.yml
index 0f7b930..7b9fac6 100644
--- a/cord-head-playbook.yml
+++ b/cord-head-playbook.yml
@@ -15,15 +15,15 @@
hosts: head
become: yes
roles:
- - { role: dns-nsd, when: not cord_provisioned }
- - { role: dns-unbound, when: not cord_provisioned }
+ - { role: dns-nsd, when: not on_maas }
+ - { role: dns-unbound, when: not on_maas }
- apt-cacher-ng
- name: Configure all hosts to use DNS server
hosts: all
become: yes
roles:
- - { role: dns-configure, when: not cord_provisioned }
+ - { role: dns-configure, when: not on_maas }
- name: Prep systems
hosts: all
@@ -51,5 +51,5 @@
- name: Set up Automated Compute Node Provisioning
hosts: head
roles:
- - { role: automation-integration, when on_maas }
+ - { role: automation-integration, when: on_maas }
diff --git a/roles/compute-prep/tasks/main.yml b/roles/compute-prep/tasks/main.yml
index 0c57979..1ddee39 100644
--- a/roles/compute-prep/tasks/main.yml
+++ b/roles/compute-prep/tasks/main.yml
@@ -32,7 +32,7 @@
mode=0755
notify:
- run rc.local
- when: not cord_provisioned
+ when: not on_maas
- name: Create /var/lib/nova dir
file:
diff --git a/roles/config-virt/tasks/main.yml b/roles/config-virt/tasks/main.yml
index f3dc91d..67a14a1 100644
--- a/roles/config-virt/tasks/main.yml
+++ b/roles/config-virt/tasks/main.yml
@@ -13,7 +13,7 @@
command=facts
- name: Tear down libvirt's default network
- when: not cord_provisioned and ansible_libvirt_networks["default"] is defined
+ when: not on_maas and ansible_libvirt_networks["default"] is defined
virt_net:
command={{ item }}
name=default
@@ -28,22 +28,22 @@
command=define
xml='{{ lookup("template", "virt_net.xml.j2") }}'
with_items: '{{ virt_nets }}'
- when: not cord_provisioned
+ when: not on_maas
- name: collect libvirt network facts after defining new network
virt_net:
command=facts
- when: not cord_provisioned
+ when: not on_maas
- name: start libvirt networks
- when: not cord_provisioned and ansible_libvirt_networks["xos-{{ item.name }}"].state != "active"
+ when: not on_maas and ansible_libvirt_networks["xos-{{ item.name }}"].state != "active"
virt_net:
name=xos-{{ item.name }}
command=create
with_items: '{{ virt_nets }}'
- name: have libvirt networks autostart
- when: not cord_provisioned and ansible_libvirt_networks["xos-{{ item.name }}"].autostart != "yes"
+ when: not on_maas and ansible_libvirt_networks["xos-{{ item.name }}"].autostart != "yes"
virt_net:
name=xos-{{ item.name }}
autostart=yes
@@ -61,7 +61,7 @@
notify:
- reload libvirt-bin
- run qemu hook
- when: not cord_provisioned
+ when: not on_maas
- name: Wait for uvt-kvm image to be available
async_status: jid={{ uvt_sync.ansible_job_id }}
diff --git a/roles/create-vms/tasks/main.yml b/roles/create-vms/tasks/main.yml
index b20c82e..48cbb3a 100644
--- a/roles/create-vms/tasks/main.yml
+++ b/roles/create-vms/tasks/main.yml
@@ -42,19 +42,19 @@
template:
src=eth0.cfg.j2
dest={{ ansible_user_dir }}/eth0.cfg
- when: not cord_provisioned
+ when: not on_maas
- name: Copy eth0 interface config file to all VMs
command: ansible services -b -u ubuntu -m copy -a "src={{ ansible_user_dir }}/eth0.cfg dest=/etc/network/interfaces.d/eth0.cfg owner=root group=root mode=0644"
- when: not cord_provisioned
+ when: not on_maas
- name: Restart eth0 interface on all VMs
command: ansible services -b -u ubuntu -m shell -a "ifdown eth0 ; ifup eth0"
- when: not cord_provisioned
+ when: not on_maas
- name: Verify that we can log into every VM after restarting network interfaces
command: ansible services -m ping -u ubuntu
- when: not cord_provisioned
+ when: not on_maas
# sshkey is registered in head-prep task
- name: Enable root ssh login on VM's that require it
diff --git a/vars/cord.yml b/vars/cord.yml
index 036b59d..65b7f4a 100644
--- a/vars/cord.yml
+++ b/vars/cord.yml
@@ -47,6 +47,3 @@
# turn this on, or override when running playbook with --extra-vars="on_cloudlab=True"
on_cloudlab: False
-
-# turn this off, or override when running playbook with --extra-vars="on_maas=False"
-on_maas: True
diff --git a/vars/cord_defaults.yml b/vars/cord_defaults.yml
index 842e9c4..56a85e3 100644
--- a/vars/cord_defaults.yml
+++ b/vars/cord_defaults.yml
@@ -1,9 +1,8 @@
---
# vars/cord_defaults.yml
-# indicate that the nodes have been provisioned by CORD MaaS
-# Change or override for a multi-node install on CloudLab
-cord_provisioned: True
+# turn this off, or override when running playbook with --extra-vars="on_maas=False"
+on_maas: True
openstack_version: kilo
diff --git a/vars/cord_single_defaults.yml b/vars/cord_single_defaults.yml
index cb21344..e5890d4 100644
--- a/vars/cord_single_defaults.yml
+++ b/vars/cord_single_defaults.yml
@@ -3,7 +3,7 @@
# For a single-node case, we don't expect the node to already have been
# provisioned by CORD MaaS. It's just Ubuntu 14.04.
-cord_provisioned: False
+on_maas: False
openstack_version: kilo