Commit 0573118b authored by Rafael Monnerat's avatar Rafael Monnerat

playbook: Drop re6stnet-legacy usage.

parent 5a4db980
...@@ -5,18 +5,14 @@ ...@@ -5,18 +5,14 @@
vars_files: vars_files:
- settings/gnet.yml - settings/gnet.yml
vars:
- computer_name: noname
vars_prompt: vars_prompt:
- name: "re6sttoken" - name: "re6sttoken"
prompt: "If you have re6st token if you have (ignore if you already have a configured re6st):" prompt: "If you have re6st token if you have (ignore if you already have a configured re6st):"
private: no private: no
default: "notoken" default: "notoken"
- name: "computer_name"
prompt: "What is this computer name? (ignore if you already have a configured re6st):"
private: no
default: "noname"
roles: roles:
- re6stnet - re6stnet
- { role: package, package_name: ntp, package_state: present }
...@@ -5,13 +5,15 @@ ...@@ -5,13 +5,15 @@
vars_files: vars_files:
- settings/vifib.yml - settings/vifib.yml
vars:
- re6sttoken: noname
vars_prompt: vars_prompt:
- name: "computer_name" - name: "computer_name"
prompt: "What is this computer name? (ignore if you already have a configured re6st and slapos):" prompt: "Please insert your email or a name of this computer:"
private: no private: no
default: "noname" default: "noname"
roles: roles:
- { role: re6stnet-legacy, package_state: present } - { role: re6stnet, package_state: present }
- { role: package, package_name: ntp, package_state: present }
...@@ -5,7 +5,15 @@ ...@@ -5,7 +5,15 @@
- name: Configure Re6st with re6st-conf - name: Configure Re6st with re6st-conf
shell: "re6st-conf --registry {{ re6st_registry_url }} --token {{ re6sttoken }} -r title {{ computer_name }} -d /etc/re6stnet" shell: "re6st-conf --registry {{ re6st_registry_url }} --token {{ re6sttoken }} -r title {{ computer_name }} -d /etc/re6stnet"
when: re6stnet_conf.stat.exists == False and "{{ re6sttoken }}" != "notoken" and "{{ computer_name }}" != "noname" when: re6st_annon == False and re6stnet_conf.stat.exists == False and "{{ re6sttoken }}" != "notoken" and "{{ computer_name }}" != "noname"
- name: Configure Re6st with re6st-conf
shell: "re6st-conf --registry {{ re6st_registry_url }} --token {{ re6sttoken }} -r title {{ re6sttoken }} -d /etc/re6stnet"
when: re6st_annon == False and re6stnet_conf.stat.exists == False and "{{ re6sttoken }}" != "notoken" and "{{ computer_name }}" == "noname"
- name: Configure Re6st with re6st-conf
shell: "re6st-conf --registry {{ re6st_registry_url }} -r title {{ computer_name }} -d /etc/re6stnet --anonymous"
when: re6st_annon == True and re6stnet_conf.stat.exists == False and "{{ computer_name }}" != "noname"
- name: Check if configuration exists already - name: Check if configuration exists already
stat: path=/etc/re6stnet/re6stnet.conf stat: path=/etc/re6stnet/re6stnet.conf
...@@ -24,5 +32,5 @@ ...@@ -24,5 +32,5 @@
when: ansible_distribution == 'CentOS' and ansible_distribution_version >= '7' and re6stnet.stat.exists == True and re6stnode.stat.exists == False when: ansible_distribution == 'CentOS' and ansible_distribution_version >= '7' and re6stnet.stat.exists == True and re6stnode.stat.exists == False
- name: Start re6st-node service - name: Start re6st-node service
service: name=re6st-node state=started enabled=yes service: name=re6stnet state=started enabled=yes
when: recheck_re6stnet_conf.stat.exists == True when: recheck_re6stnet_conf.stat.exists == True
...@@ -3,3 +3,5 @@ re6st_registry_url: http://re6stnet.nexedi.com/ ...@@ -3,3 +3,5 @@ re6st_registry_url: http://re6stnet.nexedi.com/
slapos_master_url: https://slap.vifib.com/ slapos_master_url: https://slap.vifib.com/
slapos_web_master_url: https://slapos.vifib.com/ slapos_web_master_url: https://slapos.vifib.com/
interface_name: lo interface_name: lo
re6st_annon: True
re6sttoken: noname
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
default: "notoken" default: "notoken"
roles: roles:
- { role: re6stnet-legacy, package_state: present } - { role: re6stnet, package_state: present }
- { role: slapos, package_state: present } - { role: slapos, package_state: present }
- { role: package, package_name: ntp, package_state: present } - { role: package, package_name: ntp, package_state: present }
- vifib-team-ssh-key - vifib-team-ssh-key
......
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