Fixed bug in stackdio init command

Clark Perkins · Clark Perkins · commit cc006190c0eb · 2016-07-08T16:32:32.000-05:00
diff --git a/packer/build.json b/packer/build.json
@@ -73,12 +73,12 @@
         {
             "type": "shell",
             "script": "packer/install.sh",
-            "execute_command": "{{ .Vars }} STACKDIO_VERSION={{ user `version` }} sudo -E sh '{{ .Path }}'"
+            "execute_command": "sudo su - root -c \"{{ .Vars }} STACKDIO_VERSION={{ user `version` }} sh '{{ .Path }}'\""
         },
         {
             "type": "shell",
             "script": "packer/configure.sh",
-            "execute_command": "{{ .Vars }} sudo su - stackdio -c \"sh '{{ .Path }}'\""
+            "execute_command": "sudo su - stackdio -c \"{{ .Vars }} sh '{{ .Path }}'\""
         },
         {
             "type": "shell",
diff --git a/packer/configure.sh b/packer/configure.sh
@@ -6,7 +6,7 @@ stackdio init <<EOF
 stackdio
 /var/lib/stackdio
 curl-bootstrap
-
+stable {salt_version}
 mysql://stackdio:password@localhost:3306/stackdio
 true
 yes
diff --git a/stackdio/api/stacks/serializers.py b/stackdio/api/stacks/serializers.py
@@ -74,6 +74,9 @@ def update(self, stack, validated_data):
             # This is a PUT, so just add the data directly
             stack.properties = validated_data
 
+        # Regenerate the pillar file now too
+        stack.generate_pillar_file()
+
         # Be sure to save the instance
         stack.save()
 
diff --git a/stackdio/server/management/commands.py b/stackdio/server/management/commands.py
@@ -282,9 +282,9 @@ def __init__(self, *args, **kwargs):
             'short_desc': 'Any special arguments for the bootstrap script?',
             'long_desc': ('What arguments to pass to the bootstrap script above? '
                           'Override the defaults here. See http://bootstrap.saltstack.org '
-                          'for more info.  You must include \'{salt_version}\' somewhere - '
+                          'for more info.  You must include \'{{salt_version}}\' somewhere - '
                           'it will be replaced by the current version of the salt master.'),
-            'default': 'stable archive/{salt_version}'
+            'default': 'stable {{salt_version}}'
         }, {
             'attr': 'db_dsn',
             'short_desc': ('What database DSN should stackdio use to connect to '

Original file line number	Diff line number	Diff line change
`@@ -73,12 +73,12 @@`
`73`	`73`	`{`
`74`	`74`	`"type": "shell",`
`75`	`75`	`"script": "packer/install.sh",`
`76`		- "execute_command": "{{ .Vars }} STACKDIO_VERSION={{ user `version` }} sudo -E sh '{{ .Path }}'"
	`76`	+ "execute_command": "sudo su - root -c \"{{ .Vars }} STACKDIO_VERSION={{ user `version` }} sh '{{ .Path }}'\""
`77`	`77`	`},`
`78`	`78`	`{`
`79`	`79`	`"type": "shell",`
`80`	`80`	`"script": "packer/configure.sh",`
`81`		`- "execute_command": "{{ .Vars }} sudo su - stackdio -c \"sh '{{ .Path }}'\""`
	`81`	`+ "execute_command": "sudo su - stackdio -c \"{{ .Vars }} sh '{{ .Path }}'\""`
`82`	`82`	`},`
`83`	`83`	`{`
`84`	`84`	`"type": "shell",`