Merge pull request #14 from damjanek/master
Readme + fixed curtin script
diff --git a/README.rst b/README.rst
index e07e7e6..407a2d9 100644
--- a/README.rst
+++ b/README.rst
@@ -21,6 +21,7 @@
.. code-block:: yaml
maas:
+ salt_master_ip: 192.168.0.10
region:
theme: mirantis
bind:
@@ -118,6 +119,28 @@
ip_address: 192.168.10.10
subnet: cidr:192.168.10.0/24
mac: '66:55:44:33:22:11'
+ commissioning_scripts:
+ 00-maas-06-create-raid.sh: /srv/salt/reclass/scripts/commisioning_script.sh
+ maas_config:
+ domain: mydomain.local
+ http_proxy: http://192.168.0.10:3142
+ commissioning_distro_series: xenial
+ default_distro_series: xenial
+ default_osystem: 'ubuntu'
+ default_storage_layout: lvm
+ disk_erase_with_secure_erase: true
+ dnssec_validation: 'no'
+ enable_third_party_drivers: true
+ maas_name: cfg01
+ network_discovery: 'enabled'
+ active_discovery_interval: '600'
+ ntp_external_only: true
+ ntp_servers: 10.10.11.23 10.10.11.24
+ upstream_dns: 192.168.12.13
+ enable_http_proxy: true
+ default_min_hwe_kernel: ''
+ sshprefs:
+ - 'ssh-rsa ASDFOSADFISdfasdfasjdklfjasdJFASDJfASdf923@AAAAB3NzaC1yc2EAAAADAQABAAACAQCv8ISOESGgYUOycYw1SAs/SfHTqtSCTephD/7o2+mEZO53xN98sChiFscFaPA2ZSMoZbJ6MQLKcWKMK2OaTdNSAvn4UE4T6VP0ccdumHDNRwO3f6LptvXr9NR5Wocz2KAgptk+uaA8ytM0Aj9NT0UlfjAXkKnoKyNq6yG+lx4HpwolVaFSlqRXf/iuHpCrspv/u1NW7ReMElJoXv+0zZ7Ow0ZylISdYkaqbV8QatCb17v1+xX03xLsZigfugce/8CDsibSYvJv+Hli5CCBsKgfFqLy4R5vGxiLSVzG/asdjalskjdlkasjdasd/asdajsdkjalaksdjfasd/fa/sdf/asd/fas/dfsadf blah@blah'
Single MAAS cluster service [multiple racks]
diff --git a/maas/files/curtin_userdata_amd64_generic_trusty b/maas/files/curtin_userdata_amd64_generic_trusty
index ecfbc41..bc8494f 100644
--- a/maas/files/curtin_userdata_amd64_generic_trusty
+++ b/maas/files/curtin_userdata_amd64_generic_trusty
@@ -24,7 +24,7 @@
{% endraw %}
salt_02_hostname_set: ["curtin", "in-target", "--", "echo", "{% raw %}{{node.hostname}}{% endraw %}.{{pillar.linux.system.domain}}"]
salt_03_hostname_get: ["curtin", "in-target", "--", "sh", "-c", "echo 'id: {% raw %}{{node.hostname}}{% endraw %}.{{pillar.linux.system.domain}}' >> /etc/salt/minion"]
- salt_04_master: ["curtin", "in-target", "--", "sh", "-c", "echo 'master: {{ salt_master_ip }} >> /etc/salt/minion"]
+ salt_04_master: ["curtin", "in-target", "--", "sh", "-c", "echo 'master: {{ salt_master_ip }}' >> /etc/salt/minion"]
{% raw %}
{{if third_party_drivers and driver}}
driver_00_key_get: curtin in-target -- sh -c "/bin/echo -en '{{key_string}}' > /tmp/maas-{{driver['package']}}.gpg"
diff --git a/maas/files/curtin_userdata_amd64_generic_xenial b/maas/files/curtin_userdata_amd64_generic_xenial
index 2c4b294..e645593 100644
--- a/maas/files/curtin_userdata_amd64_generic_xenial
+++ b/maas/files/curtin_userdata_amd64_generic_xenial
@@ -24,7 +24,7 @@
{% endraw %}
salt_02_hostname_set: ["curtin", "in-target", "--", "echo", "{% raw %}{{node.hostname}}{% endraw %}.{{pillar.linux.system.domain}}"]
salt_03_hostname_get: ["curtin", "in-target", "--", "sh", "-c", "echo 'id: {% raw %}{{node.hostname}}{% endraw %}.{{pillar.linux.system.domain}}' >> /etc/salt/minion"]
- salt_04_master: ["curtin", "in-target", "--", "sh", "-c", "echo 'master: {{ salt_master_ip }} >> /etc/salt/minion"]
+ salt_04_master: ["curtin", "in-target", "--", "sh", "-c", "echo 'master: {{ salt_master_ip }}' >> /etc/salt/minion"]
{% raw %}
{{if third_party_drivers and driver}}
driver_00_key_get: curtin in-target -- sh -c "/bin/echo -en '{{key_string}}' > /tmp/maas-{{driver['package']}}.gpg"