From 775996c0255db200257603af7dc21b68c774ee2e Mon Sep 17 00:00:00 2001 From: Rafael Monnerat <rafael@nexedi.com> Date: Mon, 14 Dec 2015 23:47:06 +0100 Subject: [PATCH] playbook: Update Upgrader for minimal mode Don't upgrade slapos or re6st for now vifib upgrader, only update ntp and include vifib team ssh keys --- playbook/roles/vifib-team-ssh-key/files/alain_key | 1 + .../files/rafael_key | 0 .../tasks/main.yml | 3 +++ playbook/slapos-test-node.yml | 2 +- playbook/upgrader-install.yml | 13 +++++++++++++ playbook/vifib-shuttle.yml | 2 +- playbook/vifib-upgrade.yml | 5 ++--- 7 files changed, 21 insertions(+), 5 deletions(-) create mode 100644 playbook/roles/vifib-team-ssh-key/files/alain_key rename playbook/roles/{rafael_ssh_key => vifib-team-ssh-key}/files/rafael_key (100%) rename playbook/roles/{rafael_ssh_key => vifib-team-ssh-key}/tasks/main.yml (50%) create mode 100644 playbook/upgrader-install.yml diff --git a/playbook/roles/vifib-team-ssh-key/files/alain_key b/playbook/roles/vifib-team-ssh-key/files/alain_key new file mode 100644 index 0000000..64d50cd --- /dev/null +++ b/playbook/roles/vifib-team-ssh-key/files/alain_key @@ -0,0 +1 @@ +ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAu3Rhn+Xzmf//bevX5zqUknA95Q30x61xtBhndH40xx2wFB9EjJ2N3NYBm+kpi3c1trLOKqMIxNxtkTaq5x4u29UTGhcuPVAHo7SlFq1FvJcttniWjjXjp65BzCyecwP4HjS8kbC3byRqc++sHuK6U2LRZP91Wo+WY2UikMPyJXcDWEkqU+WS5DigLh0UHhYc/1ZKhIwaJDrgMHcK3H3fPZS4MlwFj46hwDvNTluVc3ItXRf8ja/jri/VLMtaAA8Ik+5UZxHoosMc2FPm5gf/n9HsCYAoXiDaa5uFBXFnxbXp4pWYxRFdFRDvDX1M/chF97XlIN9juXR/W1OEt58iQw== alain.takoudjou@magi1 diff --git a/playbook/roles/rafael_ssh_key/files/rafael_key b/playbook/roles/vifib-team-ssh-key/files/rafael_key similarity index 100% rename from playbook/roles/rafael_ssh_key/files/rafael_key rename to playbook/roles/vifib-team-ssh-key/files/rafael_key diff --git a/playbook/roles/rafael_ssh_key/tasks/main.yml b/playbook/roles/vifib-team-ssh-key/tasks/main.yml similarity index 50% rename from playbook/roles/rafael_ssh_key/tasks/main.yml rename to playbook/roles/vifib-team-ssh-key/tasks/main.yml index 73becd4..01f7971 100644 --- a/playbook/roles/rafael_ssh_key/tasks/main.yml +++ b/playbook/roles/vifib-team-ssh-key/tasks/main.yml @@ -1,3 +1,6 @@ - name: Add rafael SSH Key authorized_key: user=root key="{{ lookup('file', 'rafael_key') }}" + + - name: Add rafael SSH Key + authorized_key: user=root key="{{ lookup('file', 'alain_key') }}" diff --git a/playbook/slapos-test-node.yml b/playbook/slapos-test-node.yml index 1af5fa0..59af365 100644 --- a/playbook/slapos-test-node.yml +++ b/playbook/slapos-test-node.yml @@ -23,4 +23,4 @@ roles: - { role: slapos, package_state: present } - { role: package, package_name: ntp, package_state: present } - - rafael_ssh_key + - vifib-team-ssh-key diff --git a/playbook/upgrader-install.yml b/playbook/upgrader-install.yml new file mode 100644 index 0000000..6471545 --- /dev/null +++ b/playbook/upgrader-install.yml @@ -0,0 +1,13 @@ +- name: a play that runs entirely on the ansible host + hosts: 127.0.0.1 + connection: local + + vars: + - upgrader_playbook: vifib-upgrade.yml + + vars_files: + - settings/upgrader.yml + + roles: + - upgrader + diff --git a/playbook/vifib-shuttle.yml b/playbook/vifib-shuttle.yml index b205093..5f0d23b 100644 --- a/playbook/vifib-shuttle.yml +++ b/playbook/vifib-shuttle.yml @@ -24,6 +24,6 @@ - { role: re6stnet-legacy, package_state: present } - { role: slapos, package_state: present } - { role: package, package_name: ntp, package_state: present } - - rafael_ssh_key + - vifib-team-ssh-key - vifib-shuttle - upgrader diff --git a/playbook/vifib-upgrade.yml b/playbook/vifib-upgrade.yml index 29dbaa9..138e20d 100644 --- a/playbook/vifib-upgrade.yml +++ b/playbook/vifib-upgrade.yml @@ -10,7 +10,6 @@ - settings/vifib.yml roles: - - { role: re6stnet-legacy, package_state: latest } - - { role: slapos, package_state: latest } - { role: package, package_name: ntp, package_state: latest } - - vifib-server + - { role: package, package_name: wget, package_state: latest } + - vifib-team-ssh-key -- 2.30.9