Commit e094762e authored by Rafael Monnerat's avatar Rafael Monnerat

playbook: Fix slapos-master request

  SlapOS Master is requested with a specific request script, by inputing
  the value via roles/standalone-shared/vars/erp5-common.yml it don"t allow
  us to modify the request include diferent configuration.
parent 96f9d021
...@@ -7,5 +7,7 @@ ...@@ -7,5 +7,7 @@
bt5_list: erp5_full_text_myisam_catalog erp5_configurator_standard bt5_list: erp5_full_text_myisam_catalog erp5_configurator_standard
startup_playbook_id: erp5-standalone.yml startup_playbook_id: erp5-standalone.yml
playbook_name: erp5 playbook_name: erp5
request_instance_template: request-erp5.j2
request_frontend_template: request-erp5-frontend.j2
roles: roles:
- standalone-shared - standalone-shared
frontend_software_release_url: https://lab.node.vifib.com/nexedi/slapos/raw/1.0.56.1/software/apache-frontend/software.cfg frontend_software_release_url: https://lab.node.vifib.com/nexedi/slapos/raw/1.0.56.1/software/apache-frontend/software.cfg
request_instance_template: request-erp5.j2
request_frontend_template: request-erp5-frontend.j2
firewall_setup_template: setup-firewall.j2 firewall_setup_template: setup-firewall.j2
frontend_master_reference: master-frn-{{ playbook_name }} frontend_master_reference: master-frn-{{ playbook_name }}
frontend_slave_reference: slave-srn-{{ playbook_name }} frontend_slave_reference: slave-srn-{{ playbook_name }}
......
...@@ -8,9 +8,9 @@ ...@@ -8,9 +8,9 @@
startup_playbook_id: slapos-master-standalone.yml startup_playbook_id: slapos-master-standalone.yml
playbook_name: slapos-master playbook_name: slapos-master
request_instance_template: request-slapos-master.j2 request_instance_template: request-slapos-master.j2
request_frontend_template: request-slapos-master-frontend.j2
pre_tasks: pre_tasks:
- file: path=/etc/slapos-ssl owner=root group=root mode=0777 state=directory - file: path=/etc/slapos-ssl owner=root group=root mode=0777 state=directory
roles: roles:
......
...@@ -7,6 +7,6 @@ ...@@ -7,6 +7,6 @@
startup_playbook_id: webrunner-standalone.yml startup_playbook_id: webrunner-standalone.yml
playbook_name: webrunner playbook_name: webrunner
request_instance_template: request-webrunner.j2 request_instance_template: request-webrunner.j2
request_frontend_template: request-slapos-master-frontend.j2
roles: roles:
- standalone-shared - standalone-shared
...@@ -7,6 +7,8 @@ ...@@ -7,6 +7,8 @@
bt5_list: erp5_full_text_myisam_catalog erp5_configurator_standard erp5_wendelin_configurator bt5_list: erp5_full_text_myisam_catalog erp5_configurator_standard erp5_wendelin_configurator
startup_playbook_id: wendelin-standalone.yml startup_playbook_id: wendelin-standalone.yml
playbook_name: wendelin playbook_name: wendelin
request_instance_template: request-erp5.j2
request_frontend_template: request-erp5-frontend.j2
roles: roles:
- standalone-shared - standalone-shared
- { role: package, package_name: socat, package_state: present } - { role: package, package_name: socat, package_state: present }
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