Apply non-core changes in CORD-912 to master
remove vestigial templates
create admin-openrc.sh in cord_profile_dir and home dir
Change-Id: I52a7cef1ea9e0dc7a37d9888fcfdc093434777ef
diff --git a/roles/juju-compute-setup/tasks/main.yml b/roles/juju-compute-setup/tasks/main.yml
index d061697..f4e3918 100644
--- a/roles/juju-compute-setup/tasks/main.yml
+++ b/roles/juju-compute-setup/tasks/main.yml
@@ -9,12 +9,6 @@
# list of active juju_machines names: juju_machines.keys()
# list of active juju_services names: juju_services.keys()
-# FIXME: Need to add firewall rules to head node or compute machines won't be
-# able to talk to head node VM's. iptables cmd's look like this:
-#
-# iptables -A FORWARD -i eth0 -o mgmtbr -s <extnet> -d <vmnet> -j ACCEPT
-# iptables -A FORWARD -i mgmtbr -o eth0 -s <vmnet> -d <extnet> -j ACCEPT
-
- name: Add machines to Juju
when: "{{ groups['compute'] | difference( juju_machines.keys() ) | length }}"
command: "juju add-machine ssh:{{ item }}"
@@ -56,20 +50,20 @@
prompt="Waiting for Juju..."
seconds=20
-# 160*15s = 2400s = 40m max wait
+# 100*30s = 3000s = 50m max wait
- name: Wait for nova-compute nodes to come online
juju_facts:
until: item in juju_compute_nodes.keys() and juju_compute_nodes[item]['workload-status']['message'] == "Unit is ready"
- retries: 160
- delay: 15
+ retries: 100
+ delay: 30
with_items: "{{ groups['compute'] }}"
- name: verify that the nodes appear in nova
action: shell bash -c "source ~/admin-openrc.sh; nova hypervisor-list | grep '{{ item }}'"
register: result
until: result | success
- retries: 10
- delay: 10
+ retries: 20
+ delay: 15
with_items: "{{ groups['compute'] }}"
tags:
- skip_ansible_lint # this really should be the os_server module, but ansible doesn't know about juju created openstack