Skip to content
Permalink
Browse files

Consolidate ansible configuration

Fold the group_vars file into the install playbook, since there is no
longer a need for these values to be shared across multiple playbooks.

Have the Jenkinsfile invoke a Makefile target so that it is easier to
do a direct deploy, and things aren't spread around unnecessarily.
  • Loading branch information...
lovett committed Apr 12, 2019
1 parent 42f51f0 commit 9e1f5c93a862750d67e58691355859ca52d142a1
Showing with 14 additions and 19 deletions.
  1. +1 −1 Jenkinsfile
  2. +4 −8 Makefile
  3. +0 −7 ansible/group_vars/all
  4. +9 −3 ansible/install.yml
@@ -28,7 +28,7 @@ pipeline {

steps {
sshagent(["f4f6a0a8-c2ae-4f7e-9bf1-869831034fad"]) {
sh "ansible-playbook -l medley ansible/install.yml"
sh "make install"
}
}
}
@@ -265,14 +265,6 @@ lint: dummy
pylint --rcfile=.pylintrc $(APP_DIR) $(PLUGIN_DIR) $(PARSER_DIR) medley.py


vagrant-install: dummy
vagrant box update
vagrant up

vagrant-provision: dummy
vagrant provision


# Empty the logindex database and re-index
#
# For use when changes to the logindex or visitors apps require a
@@ -375,3 +367,7 @@ workspace:

tmux select-window -t "$(TMUX_SESSION_NAME)":0
tmux attach-session -t "$(TMUX_SESSION_NAME)"

# Install the application on the production host via Ansible
install:
ansible-playbook --list-hosts ansible/install.yml

This file was deleted.

@@ -1,6 +1,12 @@
---
- hosts: all
- hosts: medley
vars:
project_name: medley
project_user: "{{ project_name }}"
project_group: "{{ project_name }}"
project_root: /srv/{{ project_name }}
project_backup: "/srv/{{ project_name }}.bak"
project_newinstall_tmp: "/srv/{{ project_name }}.new"
roles:
- system
- application
- system
- application

0 comments on commit 9e1f5c9

Please sign in to comment.
You can’t perform that action at this time.