Commit dacd344d by John Jarvis

support ansible 1.3

These are some minimal changes to support 1.3, does not yet include role
dependencies.
parent 93b21d05
Jinja2==2.6 Jinja2==2.6
PyYAML==3.10 PyYAML==3.10
ansible==1.2.2 ansible==1.3.1
argparse==1.2.1 argparse==1.2.1
boto==2.10.0 boto==2.10.0
paramiko==1.10.1 paramiko==1.10.1
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
# seems like paths in first_available_file must be relative to the playbooks dir # seems like paths in first_available_file must be relative to the playbooks dir
- "roles/apache/templates/{{ site_name }}.j2" - "roles/apache/templates/{{ site_name }}.j2"
notify: apache | restart apache notify: apache | restart apache
when_set: $apache_role_run when: apache_role_run is defined
tags: tags:
- apache - apache
- update - update
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
- name: apache | Creating apache2 config link {{ site_name }} - name: apache | Creating apache2 config link {{ site_name }}
file: src=/etc/apache2/sites-available/{{ site_name }} dest=/etc/apache2/sites-enabled/{{ site_name }} state={{ state }} owner=root group=root file: src=/etc/apache2/sites-available/{{ site_name }} dest=/etc/apache2/sites-enabled/{{ site_name }} state={{ state }} owner=root group=root
notify: apache | restart apache notify: apache | restart apache
when_set: $apache_role_run when: apache_role_run is defined
tags: tags:
- apache - apache
- update - update
...@@ -57,28 +57,28 @@ ...@@ -57,28 +57,28 @@
- name: rbenv | create temporary directory - name: rbenv | create temporary directory
command: mktemp -d command: mktemp -d
register: tempdir register: tempdir
when_failed: $rbuild_present when: rbuild_present|failed
tags: tags:
- ruby - ruby
- install - install
- name: rbenv | clone ruby-build repo - name: rbenv | clone ruby-build repo
git: repo=https://github.com/sstephenson/ruby-build.git dest=${tempdir.stdout}/ruby-build git: repo=https://github.com/sstephenson/ruby-build.git dest=${tempdir.stdout}/ruby-build
when_failed: $rbuild_present when: rbuild_present|failed
tags: tags:
- ruby - ruby
- install - install
- name: rbenv | install ruby-build - name: rbenv | install ruby-build
command: ./install.sh chdir=${tempdir.stdout}/ruby-build command: ./install.sh chdir=${tempdir.stdout}/ruby-build
when_failed: $rbuild_present when: rbuild_present|failed
tags: tags:
- ruby - ruby
- install - install
- name: rbenv | remove temporary directory - name: rbenv | remove temporary directory
file: path=${tempdir.stdout} state=absent file: path=${tempdir.stdout} state=absent
when_failed: $rbuild_present when: rbuild_present|failed
tags: tags:
- ruby - ruby
- install - install
...@@ -93,21 +93,21 @@ ...@@ -93,21 +93,21 @@
- name: rbenv | install ruby $ruby_version - name: rbenv | install ruby $ruby_version
shell: RBENV_ROOT=${rbenv_root} rbenv install $ruby_version shell: RBENV_ROOT=${rbenv_root} rbenv install $ruby_version
when_failed: $ruby_installed when: ruby_installed|failed
tags: tags:
- ruby - ruby
- install - install
- name: rbenv | set global ruby $ruby_version - name: rbenv | set global ruby $ruby_version
shell: RBENV_ROOT=${rbenv_root} rbenv global $ruby_version shell: RBENV_ROOT=${rbenv_root} rbenv global $ruby_version
when_failed: $ruby_installed when: ruby_installed|failed
tags: tags:
- ruby - ruby
- install - install
- name: rbenv | rehash - name: rbenv | rehash
shell: RBENV_ROOT=${rbenv_root} rbenv rehash shell: RBENV_ROOT=${rbenv_root} rbenv rehash
when_failed: $ruby_installed when: ruby_installed|failed
tags: tags:
- ruby - ruby
- install - install
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
# seems like paths in first_available_file must be relative to the playbooks dir # seems like paths in first_available_file must be relative to the playbooks dir
- "roles/nginx/templates/{{ site_name }}.j2" - "roles/nginx/templates/{{ site_name }}.j2"
notify: nginx | restart nginx notify: nginx | restart nginx
when_set: $nginx_role_run when: nginx_role_run is defined
tags: tags:
- nginx - nginx
- lms - lms
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
- name: nginx | Creating nginx config link {{ site_name }} - name: nginx | Creating nginx config link {{ site_name }}
file: src=/etc/nginx/sites-available/{{ site_name }} dest=/etc/nginx/sites-enabled/{{ site_name }} state={{ state }} owner=root group=root file: src=/etc/nginx/sites-available/{{ site_name }} dest=/etc/nginx/sites-enabled/{{ site_name }} state={{ state }} owner=root group=root
notify: nginx | restart nginx notify: nginx | restart nginx
when_set: $nginx_role_run when: nginx_role_run is defined
tags: tags:
- nginx - nginx
- lms - lms
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment