summaryrefslogtreecommitdiff
path: root/salt/openbook
diff options
context:
space:
mode:
authorCarlos Konstanski <ckonstanski@pippiandcarlos.com>2018-01-25 11:19:08 -0700
committerCarlos Konstanski <ckonstanski@pippiandcarlos.com>2018-01-25 11:19:08 -0700
commit4dc13921bbb3a1f4307ba3a465971738163ebd86 (patch)
tree1b4d0d05b2e3001eaeac7476af37aa619daa7b26 /salt/openbook
parent27d4756241c3c55962d8231189098126e8ea01a8 (diff)
git promote jenkins job
Diffstat (limited to 'salt/openbook')
-rw-r--r--salt/openbook/ansible/files/env.yaml.docker_registry.example2
-rw-r--r--salt/openbook/ansible/files/env.yaml.openbook.example2
-rw-r--r--salt/openbook/ansible/files/env.yaml.openbook_docker_slave.example2
3 files changed, 3 insertions, 3 deletions
diff --git a/salt/openbook/ansible/files/env.yaml.docker_registry.example b/salt/openbook/ansible/files/env.yaml.docker_registry.example
index f027328..7bbb6d9 100644
--- a/salt/openbook/ansible/files/env.yaml.docker_registry.example
+++ b/salt/openbook/ansible/files/env.yaml.docker_registry.example
@@ -2,7 +2,7 @@
globals:
ansible_ssh_user: root
ansible_private_key_file: /var/lib/jenkins/.ssh/id_rsa
- ansible_python_interpreter: /usr/bin/python2
+ ansible_python_interpreter: /usr/bin/python
environments:
- master:
diff --git a/salt/openbook/ansible/files/env.yaml.openbook.example b/salt/openbook/ansible/files/env.yaml.openbook.example
index c4bca63..3d04366 100644
--- a/salt/openbook/ansible/files/env.yaml.openbook.example
+++ b/salt/openbook/ansible/files/env.yaml.openbook.example
@@ -2,7 +2,7 @@
globals:
ansible_ssh_user: root
ansible_private_key_file: /var/lib/jenkins/.ssh/id_rsa
- ansible_python_interpreter: /usr/bin/python2
+ ansible_python_interpreter: /usr/bin/python
openbook_docker_registry_url: ~
openbook_docker_registry_username: ~
openbook_docker_registry_password: ~
diff --git a/salt/openbook/ansible/files/env.yaml.openbook_docker_slave.example b/salt/openbook/ansible/files/env.yaml.openbook_docker_slave.example
index 51592e9..1f74e5e 100644
--- a/salt/openbook/ansible/files/env.yaml.openbook_docker_slave.example
+++ b/salt/openbook/ansible/files/env.yaml.openbook_docker_slave.example
@@ -2,7 +2,7 @@
globals:
ansible_ssh_user: root
ansible_private_key_file: /var/lib/jenkins/.ssh/id_rsa
- ansible_python_interpreter: /usr/bin/python2
+ ansible_python_interpreter: /usr/bin/python
locale: en_US.utf8
salt_master: localhost