Commit e47a0f5f authored by Rafael Monnerat's avatar Rafael Monnerat

Merge branch 'master' into 'master'

Use connection local to install slapcache.

See merge request !5
parents ee66590c 16ce27d0
No related merge requests found
......@@ -36,6 +36,7 @@
- { role: "install-script", playbook_yml: "slapos.yml", script_path: "install/slapos" }
- { role: "install-script", playbook_yml: "re6stnet.yml", script_path: "install/re6st"}
- { role: "install-script", playbook_yml: "vifib.yml", script_path: "install/vifib"}
- { role: "install-script", playbook_yml: "vifib-shuttle.yml", script_path: "install/vifib-shuttle"}
- { role: "install-script", playbook_yml: "erp5-standalone.yml", script_path: "install/erp5-standalone"}
- { role: "install-script", playbook_yml: "wendelin-standalone.yml", script_path: "install/wendelin-standalone"}
- { role: "install-script", playbook_yml: "slapos-test-node.yml", script_path: "install/slapos-test-node"}
......
......@@ -98,4 +98,4 @@ if is_ubuntu && [[ $DISTRO == "trusty" ]]; then
fi
ansible localhost -m easy_install -a name=slapcache
ansible localhost -m easy_install -a name=slapcache --connection=local
- name: Add rafael SSH Key
authorized_key: user=root key="{{ lookup('file', 'rafael_key') }}"
- name: Add rafael SSH Key on slapos user
authorized_key: user=slapos key="{{ lookup('file', 'rafael_key') }}"
......@@ -13,7 +13,7 @@
when: ansible_distribution == "Debian"
- name: Install re6stnet package
apt: name=babeld=1.5.1-nxd2 state={{ package_state }} update_cache=yes
apt: name=babeld=1.5.1-nxd2 state=present update_cache=yes
when: ansible_distribution == "Debian"
- name: Install re6stnet package
......
---
- file: path=/opt/upgrader state=directory mode=0755
- stat: path=/opt/upgrader/last-upgrade
register: last_upgrade
......@@ -9,13 +11,15 @@
- shell: rm -rf /opt/upgrader/playbook/
- file: path=/opt/upgrader/playbook/ state=directory mode=0755
- shell: mkdir -p /opt/upgrader/playbook
- name: Periodically download the latest playbook
shell: slapcache-download --destination=/opt/upgrader/archive.tar.gz
- name: Uncompress
unarchive: src=/opt/upgrader/archive.tar.gz dest=/opt/upgrader/playbook/
shell: tar -xzvf /opt/upgrader/archive.tar.gz
args:
chdir: /opt/upgrader/playbook/
- name: Save new archive MD5
stat: path=/opt/upgrader/archive.tar.gz
......
......@@ -6,7 +6,7 @@
shell: modprobe coretemp > /dev/null 2>&1
- name: "Load f71882fg"
shell: modprobe f71882fg > /dev/null 2>&1
shell: echo "DISABLED modprobe f71882fg > /dev/null 2>&1"
- name: "Do sysctl"
shell: sysctl -w net.ipv4.neigh.default.gc_thresh1=512 net.ipv4.neigh.default.gc_thresh2=1024 net.ipv4.neigh.default.gc_thresh3=2048 net.ipv6.neigh.default.gc_thresh1=512 net.ipv6.neigh.default.gc_thresh2=1024 net.ipv6.neigh.default.gc_thresh3=2048
......@@ -14,7 +14,4 @@
- name: echo 1 > /sys/kernel/mm/ksm/run
shell: echo 1 > /sys/kernel/mm/ksm/run
- name: "Install firmware-realtek"
apt: name=firmware-realtek
apt: name=firmware-realtek state=latest update_cache=yes cache_valid_time=3600
when: ansible_os_family == "Debian"
- include: user.yml
---
- name: remove other unwanted users
user: name={{ item }} state=absent
with_items:
- slapos
- nexedi
......@@ -2,8 +2,12 @@
hosts: 127.0.0.1
connection: local
vars:
- upgrader_playbook: vifib-upgrade.yml
vars_files:
- settings/vifib.yml
- settings/upgrader.yml
vars_prompt:
- name: "computer_name"
......@@ -20,5 +24,6 @@
- { role: re6stnet-legacy, package_state: present }
- { role: slapos, package_state: present }
- { role: package, package_name: ntp, package_state: present }
- vifib-server-shuttle
- rafael_ssh_key
- vifib-shuttle
- upgrader
......@@ -3,7 +3,6 @@
connection: local
vars:
- upgrader-playbook: vifib-upgrader.yml
- computer_name: noname
- slapostoken: notoken
......@@ -14,6 +13,4 @@
- { role: re6stnet-legacy, package_state: latest }
- { role: slapos, package_state: latest }
- { role: package, package_name: ntp, package_state: latest }
- { role: package, package_name: ntp, package_state: latest }
- vifib-server
- upgrader
......@@ -3,7 +3,7 @@
connection: local
vars:
- upgrader-playbook: vifib-upgrader.yml
- upgrader_playbook: vifib-upgrader.yml
vars_files:
- settings/vifib.yml
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment