From 5c698eeea2cf1afcf8048705df3a7539540ffc93 Mon Sep 17 00:00:00 2001 From: Marvin Steadfast Date: Thu, 21 Jul 2016 12:06:21 +0200 Subject: [PATCH] fixed vagrant and ansible to use xonsh --- .gitignore | 1 + Vagrantfile | 3 +++ ansible/vagrant.yml | 10 +++++----- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 0adcf45..075cbb8 100644 --- a/.gitignore +++ b/.gitignore @@ -50,3 +50,4 @@ nosetests.xml pelican-plugins/* .DS_Store node_modules +*.retry diff --git a/Vagrantfile b/Vagrantfile index 384cbfd..78ee124 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -5,6 +5,9 @@ Vagrant.configure(2) do |config| config.vm.network "forwarded_port", guest: 8888, host: 8888 config.vm.network "forwarded_port", guest: 8000, host: 8000 config.ssh.forward_agent = true + #config.ssh.username = "vagrant" + #config.ssh.private_key_path = ["~/.ssh/id_rsa", "~/.vagrant.d/insecure_private_key"] + #config.ssh.insert_key = false config.vm.provider "docker" do |d| d.build_dir = "./vagrant" diff --git a/ansible/vagrant.yml b/ansible/vagrant.yml index fbfecfb..94f9475 100644 --- a/ansible/vagrant.yml +++ b/ansible/vagrant.yml @@ -106,19 +106,19 @@ - name: run batcave command: - ~/ansible/bin/ansible-playbook -i hosts base.yml -c local --extra-vars="hosts=localhost" + ~/ansible/bin/ansible-playbook -i hosts xonsh.yml -c local --extra-vars="hosts=localhost" chdir=~/.batcave environment: SSL_CERT_FILE: /etc/ssl/certs/ca-certificates.crt - name: export variables lineinfile: - dest=~/.zshrc + dest=~/.xonshrc line='{{ item }}' with_items: - - export PYTHONIOENCODING=UTF-8 - - export LC_ALL=C.UTF-8 - - export SSL_CERT_FILE=/etc/ssl/certs/ca-certificates.crt + - $PYTHONIOENCODING = 'UTF-8' + - $LC_ALL = 'C.UTF-8' + - $SSL_CERT_FILE = '/etc/ssl/certs/ca-certificates.crt' - name: no git colors command: git config --global color.ui false