Add new scenario for vifib without re6st

This will be useful to setup machines where we already have IPv6 (for
example, VM with IPv6 coming from the host).

playbook/re6stnet.yml

@@ -19,5 +19,6 @@
       default: "notoken"
 
   roles:
-    - { role: re6stnet, package_state: present }
+    - { role: re6stnet-install }
+    - { role: re6stnet-ensure-running }
 

playbook/rina.yml

@@ -15,5 +15,6 @@
       default: "noname"
 
   roles:
-    - { role: re6stnet, package_state: present }
+    - { role: re6stnet-install }
+    - { role: re6stnet-ensure-running }
     - rina

playbook/roles/re6stnet-ensure-running/tasks/main.yml

+  - name: Check if ip6tables check script is present
+    stat: path=/usr/bin/re6stnet-ip6tables-check
+    register: ip6tables_check
+
+  - name: Run re6stnet-ip6tables-check
+    shell: /usr/bin/re6stnet-ip6tables-check
+    when: ip6tables_check.stat.exists == True
+
+  - name: Check if configuration already exists
+    stat: path=/etc/re6stnet/re6stnet.conf
+    register: check_re6stnet_conf
+
+  - name: Start re6st-node service
+    service: name=re6stnet state=started enabled=yes
+    when: check_re6stnet_conf.stat.exists == True

playbook/roles/re6stnet/tasks/main.yml → playbook/roles/re6stnet-install/tasks/main.yml

@@ -50,14 +50,8 @@
   - name: Add script for check ip6tables well configured
     copy: src=ip6tables dest=/usr/bin/re6stnet-ip6tables-check mode=755
 
-  - name: Run re6stnet-ip6tables-check
-    shell: /usr/bin/re6stnet-ip6tables-check
-
   - name: Include re6stnet-ip6tables-check at reboot on cron
     cron: name="ip6tables at reboot" special_time=reboot job="sleep 20 && /usr/bin/re6stnet-ip6tables-check"
 
   - include: tcp_nodelay.yml
 
-  - name: Start re6st-node service
-    service: name=re6stnet state=started enabled=yes
-    when: recheck_re6stnet_conf.stat.exists == True

playbook/roles/vifib-server/tasks/main.yml

@@ -23,22 +23,6 @@
   - include: kvm.yml
   - include: shuttle-modprobe.yml
 
-  - name: Check if re6stnet is configured
-    stat: path=/etc/re6stnet/re6stnet.conf
-    register: re6stnet_conf
-
-  - name: Check if ip6tables check script is present
-    stat: path=/usr/bin/re6stnet-ip6tables-check
-    register: ip6tables_check
-
-  - name: Run re6stnet-ip6tables-check
-    shell: /usr/bin/re6stnet-ip6tables-check
-    when: ip6tables_check.stat.exists == True
-
-  - name: Start re6st-node service if not started
-    service: name=re6stnet state=started enabled=yes
-    when: re6stnet_conf.stat.exists == True
-
   - name: Increase ulimit
     shell: echo "TODO"
 

playbook/roles/vifib-upgrade/meta/main.yml

@@ -13,7 +13,7 @@ dependencies:
   - { role: package, package_name: slapos-node, package_state: latest }
   - { role: package, package_name: re6st-node, package_state: latest }
   - { role: package, package_name: apt, package_state: latest }
-  - { role: re6stnet }
+  - { role: re6stnet-ensure-running }
   - { role: etckeeper }
   - { role: vifib-team-ssh-key }
   - { role: vifib-server }

playbook/vifib-base.yml

@@ -13,7 +13,7 @@
     - settings/slapos-master.yml
 
   roles:
-    - { role: re6stnet, package_state: present }
+    - { role: re6stnet-install }
     - { role: slapos, package_state: present } 
     - { role: package, package_name: ntp, package_state: present }
     - vifib-team-ssh-key

playbook/vifib-re6stnet.yml

@@ -10,10 +10,11 @@
 
   vars_prompt:
     - name: "computer_name"
-      prompt: "Please insert your email or a name of this computer:"
+      prompt: "Please insert your email or a name of this computer, it will be used to configure re6st:"
       private: no
       default: "noname"
 
   roles:
-    - { role: re6stnet, package_state: present }
+    - { role: re6stnet-install }
+    - { role: re6stnet-ensure-running }
 

playbook/vifib-without-re6stnet.yml

+- 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/vifib.yml
+    - settings/upgrader.yml
+    - settings/slapos-master.yml
+
+  vars_prompt:
+    - name: "computer_name"
+      prompt: "What is this computer name?  (ignore if you already have a configured re6st and slapos):"
+      private: no
+      default: "noname"
+
+    - name: "slapostoken"
+      prompt: "If you have slapos token if you have (ignore if you already have a configured slapos):"
+      private: no
+      default: "notoken"
+
+  roles:
+    - { role: slapos, package_state: present }
+    - { role: package, package_name: ntp, package_state: present }
+    - vifib-team-ssh-key
+    - upgrader
+    - vifib-server

playbook/vifib.yml

@@ -22,7 +22,7 @@
       default: "notoken"
 
   roles:
-    - { role: re6stnet, package_state: present }
+    - { role: re6stnet-install, package_state: present }
     - { role: slapos, package_state: present } 
     - { role: package, package_name: ntp, package_state: present }
     - vifib-team-ssh-key