diff --git a/ansible/inventories/digital_ocean.yml b/ansible/inventories/digital_ocean.yml index 0acbf18c4..726bbea01 100644 --- a/ansible/inventories/digital_ocean.yml +++ b/ansible/inventories/digital_ocean.yml @@ -13,14 +13,14 @@ groups: push: inventory_hostname.startswith('app-push') blogs: inventory_hostname.startswith('blog') - work: inventory_hostname.startswith('task-work') - node: inventory_hostname.startswith('node') node_socket: inventory_hostname.startswith('node-socket') # debugs: inventory_hostname.startswith('debug') task: inventory_hostname.startswith('task') + celery: inventory_hostname.startswith('task-celery') + work: inventory_hostname.startswith('task-work') staging: inventory_hostname.startswith('staging') diff --git a/ansible/playbooks/deploy_www.yml b/ansible/playbooks/deploy_www.yml index 2e0dedbcf..c77d175c1 100644 --- a/ansible/playbooks/deploy_www.yml +++ b/ansible/playbooks/deploy_www.yml @@ -41,6 +41,6 @@ - name: Reload haproxy debug: msg: Gracefully reloading HAProxy - when: updated_config and haproxy_verified.rc == 0 + when: haproxy_verified.rc == 0 changed_when: yes notify: reload haproxy diff --git a/ansible/playbooks/setup_app.yml b/ansible/playbooks/setup_app.yml index b5968cad0..f8d402e32 100644 --- a/ansible/playbooks/setup_app.yml +++ b/ansible/playbooks/setup_app.yml @@ -1,6 +1,7 @@ --- - name: SETUP -> app containers hosts: web + serial: "50%" vars_files: - ../env_vars/base.yml vars: diff --git a/terraform/digitalocean.tf b/terraform/digitalocean.tf index 0350f72a2..5ef999637 100644 --- a/terraform/digitalocean.tf +++ b/terraform/digitalocean.tf @@ -522,8 +522,8 @@ resource "digitalocean_droplet" "task-celery" { size = var.droplet_size ssh_keys = [digitalocean_ssh_key.default.fingerprint] provisioner "local-exec" { - # command = "/srv/newsblur/ansible/utils/generate_inventory.py; sleep 120" - command = "sleep 120" + command = "/srv/newsblur/ansible/utils/generate_inventory.py; sleep 120" + # command = "sleep 120" } provisioner "local-exec" { command = "cd ..; ansible-playbook -l ${self.name} ansible/playbooks/setup_root.yml"