Commit 7cb9b954 authored by Kristopher Ruzic's avatar Kristopher Ruzic

Merge branch 'master' of https://lab.nexedi.cn/krruzic/slapos.package

Conflicts:
	playbook/roles/wendelin-standalone/files/request-wendelin
	playbook/wendelin-standalone.yml
parents a6e9add6 754c2b4a
...@@ -4,9 +4,12 @@ ...@@ -4,9 +4,12 @@
vars: vars:
software_release_url: https://lab.nexedi.cn/nexedi/slapos/raw/1.0.3/software/wendelin/software.cfg software_release_url: https://lab.nexedi.cn/nexedi/slapos/raw/1.0.3/software/wendelin/software.cfg
<<<<<<< HEAD
startup_playbook_id: wendelin-standalone.yml startup_playbook_id: wendelin-standalone.yml
playbook_name: wendelin playbook_name: wendelin
request_instance_template: request-wendelin.j2 request_instance_template: request-wendelin.j2
=======
>>>>>>> 754c2b4af77d43544ff5cb4112b6afc9875ea535
roles: roles:
- standalone-shared - standalone-shared
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