Skip to content

Commit 8961f9b

Browse files
committed
Fixes #165: Fix lingering deprecation warnings in some examples.
1 parent 062e694 commit 8961f9b

File tree

8 files changed

+61
-33
lines changed

8 files changed

+61
-33
lines changed

deployments-rolling/ansible.cfg

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
[defaults]
2+
host_key_checking = False
3+
roles_path = ./roles
4+
nocows = 1
5+
retry_files_enabled = False
6+
force_valid_group_names = ignore
7+
8+
[ssh_connection]
9+
control_path = %(directory)s/%%h-%%p-%%r
10+
pipelining = True

docker-hubot/main.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
- hosts: localhost
33
connection: local
4-
gather_facts: no
4+
gather_facts: false
55

66
vars:
77
base_image: node:8
@@ -13,7 +13,8 @@
1313
- name: Make the latest version of the base image available locally.
1414
docker_image:
1515
name: '{{ base_image }}'
16-
force: yes
16+
source: pull
17+
force_source: true
1718

1819
- name: Create the Docker container.
1920
docker_container:
@@ -37,7 +38,7 @@
3738
rm -rf /var/lib/apt/lists/*
3839
delegate_to: '{{ container_name }}'
3940
args:
40-
warn: no
41+
warn: false
4142

4243
- name: Commit the container.
4344
command: >

docker/main.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,10 @@
66
- name: Ensure Docker image is built from the test Dockerfile.
77
docker_image:
88
name: test
9-
path: test
10-
state: build
9+
source: build
10+
build:
11+
path: test
12+
state: present
1113

1214
- name: Ensure the test container is running.
1315
docker_container:

dynamic-inventory/custom/inventory.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ function example_inventory() {
1919
'vars' => [
2020
'ansible_ssh_user' => 'vagrant',
2121
'ansible_ssh_private_key_file' => '~/.vagrant.d/insecure_private_key',
22+
'ansible_python_interpreter' => '/usr/bin/python3',
2223
'example_variable' => 'value',
2324
],
2425
],

dynamic-inventory/custom/inventory.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,8 @@ def example_inventory(self):
4141
'ansible_ssh_user': 'vagrant',
4242
'ansible_ssh_private_key_file':
4343
'~/.vagrant.d/insecure_private_key',
44+
'ansible_python_interpreter':
45+
'/usr/bin/python3',
4446
'example_variable': 'value'
4547
}
4648
},

includes/provisioning/tasks/common.yml

Lines changed: 29 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,39 @@
11
---
22
- name: Get software for apt repository management.
3-
apt: "name={{ item }} state=present"
4-
with_items:
5-
- python-apt
6-
- python-pycurl
3+
apt:
4+
name:
5+
- python-apt
6+
- python-pycurl
7+
state: present
78

89
- name: Add ondrej repository for later versions of PHP.
910
apt_repository: repo='ppa:ondrej/php' update_cache=yes
1011

1112
- name: "Install Apache, MySQL, PHP, and other dependencies."
12-
apt: "name={{ item }} state=present"
13-
with_items:
14-
- git
15-
- curl
16-
- unzip
17-
- sendmail
18-
- apache2
19-
- php7.1-common
20-
- php7.1-cli
21-
- php7.1-dev
22-
- php7.1-gd
23-
- php7.1-curl
24-
- php7.1-json
25-
- php7.1-opcache
26-
- php7.1-xml
27-
- php7.1-mbstring
28-
- php7.1-pdo
29-
- php7.1-mysql
30-
- php-apcu
31-
- libpcre3-dev
32-
- libapache2-mod-php7.1
33-
- python-mysqldb
34-
- mysql-server
13+
apt:
14+
name:
15+
- git
16+
- curl
17+
- unzip
18+
- sendmail
19+
- apache2
20+
- php7.1-common
21+
- php7.1-cli
22+
- php7.1-dev
23+
- php7.1-gd
24+
- php7.1-curl
25+
- php7.1-json
26+
- php7.1-opcache
27+
- php7.1-xml
28+
- php7.1-mbstring
29+
- php7.1-pdo
30+
- php7.1-mysql
31+
- php-apcu
32+
- libpcre3-dev
33+
- libapache2-mod-php7.1
34+
- python-mysqldb
35+
- mysql-server
36+
state: present
3537

3638
- name: Disable the firewall (since this is for local dev only).
3739
service: name=ufw state=stopped

kubernetes/ansible.cfg

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
[defaults]
2+
host_key_checking = False
3+
roles_path = ./roles
4+
nocows = 1
5+
retry_files_enabled = False
6+
force_valid_group_names = ignore
7+
8+
[ssh_connection]
9+
control_path = %(directory)s/%%h-%%p-%%r
10+
pipelining = True

tests/solr.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
---
22
# Solr test.
3-
- include: ../solr/provisioning/playbook.yml
3+
- import_playbook: ../solr/provisioning/playbook.yml

0 commit comments

Comments
 (0)