summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-07-28 17:04:07 +0000
committerGerrit Code Review <review@openstack.org>2017-07-28 17:04:07 +0000
commite751b92d75fda71f94ff487732e9814d396cd4bb (patch)
treedef1dfc4d1c55bb6d5dc80aa9cf115d3aa73533a
parentf54474e09238cea86bcd01d78e2b5a6d1ec69308 (diff)
parenteeccc79109b64587355ee97cbd78e0d229bd0f20 (diff)
Merge "Update ansible to 2.3.0"HEADmaster
-rwxr-xr-xutils/jenkins/kargo_deploy.sh2
-rwxr-xr-xutils/jenkins/run_k8s_verify.sh2
-rw-r--r--utils/kargo/roles/configure_logs/tasks/main.yml2
3 files changed, 3 insertions, 3 deletions
diff --git a/utils/jenkins/kargo_deploy.sh b/utils/jenkins/kargo_deploy.sh
index 00144a1..9543db9 100755
--- a/utils/jenkins/kargo_deploy.sh
+++ b/utils/jenkins/kargo_deploy.sh
@@ -42,7 +42,7 @@ ANSIBLE_FORKS=${ANSIBLE_FORKS:-50}
42 42
43# Valid sources: pip, apt 43# Valid sources: pip, apt
44ANSIBLE_INSTALL_SOURCE=pip 44ANSIBLE_INSTALL_SOURCE=pip
45required_ansible_version="2.2.1" 45required_ansible_version="2.3.0"
46 46
47function collect_info { 47function collect_info {
48 # Get diagnostic info and store it as the logs.tar.gz at the admin node 48 # Get diagnostic info and store it as the logs.tar.gz at the admin node
diff --git a/utils/jenkins/run_k8s_verify.sh b/utils/jenkins/run_k8s_verify.sh
index 5c8a431..24cb68b 100755
--- a/utils/jenkins/run_k8s_verify.sh
+++ b/utils/jenkins/run_k8s_verify.sh
@@ -16,7 +16,7 @@ OS_SPECIFIC_DEFAULTS_SRC="${BASH_SOURCE%/*}/../kargo/${OS_SPECIFIC_DEFAULTS_YAML
16SLAVE_IPS=( $SLAVE_IPS ) 16SLAVE_IPS=( $SLAVE_IPS )
17ADMIN_IP=${ADMIN_IP:-${SLAVE_IPS[0]}} 17ADMIN_IP=${ADMIN_IP:-${SLAVE_IPS[0]}}
18 18
19required_ansible_version="2.1.0" 19required_ansible_version="2.3.0"
20 20
21function exit_gracefully { 21function exit_gracefully {
22 local exit_code=$? 22 local exit_code=$?
diff --git a/utils/kargo/roles/configure_logs/tasks/main.yml b/utils/kargo/roles/configure_logs/tasks/main.yml
index 8e135af..83f9c42 100644
--- a/utils/kargo/roles/configure_logs/tasks/main.yml
+++ b/utils/kargo/roles/configure_logs/tasks/main.yml
@@ -17,7 +17,7 @@
17 17
18- name: Configure logs | ensure config file 18- name: Configure logs | ensure config file
19 get_url: 19 get_url:
20 url: https://raw.githubusercontent.com/ansible/ansible/stable-2.2/examples/ansible.cfg 20 url: https://raw.githubusercontent.com/ansible/ansible/stable-2.3/examples/ansible.cfg
21 dest: "{{conf_file}}" 21 dest: "{{conf_file}}"
22 force: no 22 force: no
23 owner: root 23 owner: root