Skip to content

Commit

Permalink
Version 0.1a
Browse files Browse the repository at this point in the history
Version 0.1a
  • Loading branch information
victorock authored Jul 3, 2018
2 parents 17ea1d4 + 874dd12 commit 88f2869
Show file tree
Hide file tree
Showing 7 changed files with 19 additions and 27 deletions.
9 changes: 0 additions & 9 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,6 @@ script:
# Run container in detached state.
- docker run --detach --volume="$PWD":/etc/ansible/roles/test:ro --name $container_id $run_opts samdoran/${distro}-ansible:latest $init

# Install pip
- 'docker exec --tty $container_id yum install -y python-pip'

# Install ansible-lint
- 'docker exec --tty $container_id pip install ansible-lint'

# Run ansible-lint test
- 'docker exec --tty $container_id ansible-lint /etc/ansible/roles/test/tests/test.yml'

# Ansible syntax check.
- 'docker exec --tty $container_id env TERM=xterm ansible-playbook -c local -b -i /etc/ansible/roles/test/tests/inventory /etc/ansible/roles/test/tests/test.yml --syntax-check'

Expand Down
6 changes: 3 additions & 3 deletions tasks/dynamips.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
dest: "{{ gns3_server_build_path }}/dynamips"
clone: yes
when:
- not _dynamips_binary.stat.executable
- not _dynamips_binary.stat.exists
- "gns3_server_dynamips_state != 'absent'"

- name: "dynamips: Generate makefiles with cmake"
Expand All @@ -43,7 +43,7 @@
args:
chdir: "{{ gns3_server_build_path }}/dynamips"
when:
- not _dynamips_binary.stat.executable
- not _dynamips_binary.stat.exists
- "gns3_server_dynamips_state != 'absent'"

- name: "dynamips: Install with make"
Expand All @@ -54,7 +54,7 @@
target: install
notify: gns3_server_service_restart
when:
- not _dynamips_binary.stat.executable
- not _dynamips_binary.stat.exists
- "gns3_server_dynamips_state != 'absent'"

- name: "dynamips: Ensure absence of repository"
Expand Down
4 changes: 2 additions & 2 deletions tasks/iouyap.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
dest: "{{ gns3_server_build_path }}/iouyap"
clone: yes
when:
- not _iouyap_binary.stat.executable
- not _iouyap_binary.stat.exists
- "gns3_server_iouyap_state != 'absent'"

- name: "iouyap: Install with make"
Expand All @@ -34,7 +34,7 @@
target: install
notify: gns3_server_service_restart
when:
- not _iouyap_binary.stat.executable
- not _iouyap_binary.stat.exists
- "gns3_server_iouyap_state != 'absent'"

- name: "iouyap: Ensure absence of repository"
Expand Down
11 changes: 0 additions & 11 deletions tasks/server.yml
Original file line number Diff line number Diff line change
@@ -1,14 +1,3 @@
- name: "server: Ensure state of packages"
become: true
become_user: root
yum:
name: "{{ _gns3_server_package.name | default(_gns3_server_package) }}"
state: "{{ _gns3_server_package.state | default(omit) }}"
update_cache: "{{ _gns3_server_package.update_cache | default(omit) }}"
loop: "{{ _gns3_server_packages }}"
loop_control:
loop_var: _gns3_server_package

- name: "server: Ensure state of pip_packages"
become: true
become_user: root
Expand Down
11 changes: 11 additions & 0 deletions tasks/setup.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,3 +26,14 @@
loop: "{{ _gns3_server_paths }}"
loop_control:
loop_var: _gns3_server_path

- name: "setup: Ensure state of packages"
become: true
become_user: root
yum:
name: "{{ _gns3_server_package.name | default(_gns3_server_package) }}"
state: "{{ _gns3_server_package.state | default(omit) }}"
update_cache: "{{ _gns3_server_package.update_cache | default(omit) }}"
loop: "{{ _gns3_server_packages }}"
loop_control:
loop_var: _gns3_server_package
4 changes: 2 additions & 2 deletions tasks/ubridge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
dest: "{{ gns3_server_build_path }}/ubridge"
clone: yes
when:
- not _ubridge_binary.stat.executable
- not _ubridge_binary.stat.exists
- "gns3_server_ubridge_state != 'absent'"

- name: "ubridge: Install with make"
Expand All @@ -34,7 +34,7 @@
target: install
notify: gns3_server_service_restart
when:
- not _ubridge_binary.stat.executable
- not _ubridge_binary.stat.exists
- "gns3_server_ubridge_state != 'absent'"

- name: "ubridge: Ensure absence of repository"
Expand Down
1 change: 1 addition & 0 deletions vars/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ _gns3_server_packages:

- name:
- "@Development tools"
- git
- python34
- python34-devel
- python34-setuptools
Expand Down

0 comments on commit 88f2869

Please sign in to comment.