x/solar
Code Issues Proposed changes

Remove ansible.cfg, we use .ssh/config now

Browse Source 
Change-Id: I257bd0c7050516746ff77b8ef09dc169b945deae
This commit is contained in:
Łukasz Oleś 2016-01-15 22:02:43 +01:00
parent e659e79346
commit aea48b733e
5 changed files with 4 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Vagrantfile vendored
View File

@ -116,7 +116,6 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
config.vm.host_name = "solar-dev#{index}" config.vm.host_name = "solar-dev#{index}"
if PREPROVISIONED if PREPROVISIONED
config.vm.provision "file", source: "bootstrap/ansible.cfg", destination: "/home/vagrant/.ansible.cfg"
config.vm.provision "shell", inline: solar_agent_script, privileged: true config.vm.provision "shell", inline: solar_agent_script, privileged: true
#TODO(bogdando) figure out how to configure multiple interfaces when was not PREPROVISIONED #TODO(bogdando) figure out how to configure multiple interfaces when was not PREPROVISIONED
ind = 0 ind = 0

2
bootstrap/ansible.cfg
View File

@ -1,2 +0,0 @@
[defaults]
host_key_checking = False

2
bootstrap/playbooks/solar.yaml
View File

@ -59,6 +59,4 @@
- name: start riak container - name: start riak container
shell: docker-compose up -d riak chdir=/vagrant shell: docker-compose up -d riak chdir=/vagrant
- name: configuring Ansible
copy: src=/vagrant/bootstrap/ansible.cfg dest=/home/vagrant/.ansible.cfg
- include: tasks/celery_init.yaml - include: tasks/celery_init.yaml

10
bootstrap/solar-master.json
View File

@ -112,16 +112,12 @@
]}, { ]}, {
"type": "shell", "type": "shell",
"inline": ["sudo mkdir -p {{ user `ansible_config_path` }}"] "inline": ["sudo mkdir -p {{ user `ansible_config_path` }}"]
}, {
"type": "file",
"source": "ansible.cfg",
"destination": "/tmp/ansible.cfg"
}, {
"type": "shell",
"inline": ["sudo mv /tmp/ansible.cfg {{ user `ansible_config_path` }}/{{ user `ansible_config_file` }}"]
}, { }, {
"type": "shell", "type": "shell",
"inline": [ "inline": [
"touch /tmp/ansible.cfg",
"sudo mv /tmp/ansible.cfg {{ user `ansible_config_path` }}/{{ user `ansible_config_file` }}",
"sudo echo '[defaults]' >> {{ user `ansible_config_path` }}/{{ user `ansible_config_file` }}",
"sudo echo 'log_path = {{ user `ansible_log_file` }}' >> {{ user `ansible_config_path` }}/{{ user `ansible_config_file` }}", "sudo echo 'log_path = {{ user `ansible_log_file` }}' >> {{ user `ansible_config_path` }}/{{ user `ansible_config_file` }}",
"sudo touch {{ user `ansible_log_file` }}", "sudo touch {{ user `ansible_log_file` }}",
"sudo chmod 666 {{ user `ansible_log_file` }}" "sudo chmod 666 {{ user `ansible_log_file` }}"

2
utils/jenkins/run.sh
View File

@ -21,7 +21,7 @@ ENV_NAME=${ENV_NAME} SLAVES_COUNT=${SLAVES_COUNT} IMAGE_PATH=${IMAGE_PATH} CONF_
# Wait for master to boot # Wait for master to boot
sleep 30 sleep 30
sshpass -p ${ADMIN_PASSWORD} rsync -az . -e ssh ${ADMIN_USER}@${ADMIN_IP}:/home/vagrant/solar --include bootstrap/playbooks --include bootstrap/ansible.cfg --exclude "bootstrap/*" --exclude .tox --exclude tmp --exclude x-venv sshpass -p ${ADMIN_PASSWORD} rsync -az . -e ssh ${ADMIN_USER}@${ADMIN_IP}:/home/vagrant/solar --include bootstrap/playbooks --exclude "bootstrap/*" --exclude .tox --exclude tmp --exclude x-venv
sshpass -p ${ADMIN_PASSWORD} ssh ${ADMIN_USER}@${ADMIN_IP} bash -s <<EOF sshpass -p ${ADMIN_PASSWORD} ssh ${ADMIN_USER}@${ADMIN_IP} bash -s <<EOF
set -x set -x