commit c86fbafe0dd28989fbdda514193f7fdb21467d29
author azvyagintsev <azvyagintsev@mirantis.com> Fri Mar 02 18:57:03 2018 +0200
committer azvyagintsev <azvyagintsev@mirantis.com> Fri Mar 02 19:25:07 2018 +0200
tree 0011c193ae37a7c5f3ba38834b2d0b1da1bd9528
parent 6d45385a7c25f6d4bbfb9a2b050ad85898ec505f

cleanup mirror-image

Change-Id: Iba39ddce46cff01e41e34b8c26970bc3cb46ff48

mirror-image/template.json

diff --git a/mirror-image/template.json b/mirror-image/template.json
index 1bd1360..b1a7171 100644
--- a/mirror-image/template.json
+++ b/mirror-image/template.json
@@ -6,7 +6,7 @@
     "image_name": "{{ env `IMAGE_NAME` }}",
     "VM_IMAGE": "{{ env `VM_IMAGE` }}",
     "floating_ip_pool": "{{ env `VM_FLOATING_IP_POOL` }}",
-    "VM_FLAVOR" : "{{ env `VM_FLAVOR` }}",
+    "VM_FLAVOR": "{{ env `VM_FLAVOR` }}",
     "disk_size": "150000",
     "cluster_model": "{{ env `CLUSTER_MODEL` }}",
     "cluster_model_ref": "{{ env `CLUSTER_MODEL_REF` }}",
@@ -34,6 +34,11 @@
       "destination": "/root/minion.conf"
     },
     {
+      "type": "file",
+      "source": "files/tmp/bootstrap.saltstack.com.sh",
+      "destination": "/tmp/bootstrap.saltstack.com.sh"
+    },
+    {
       "environment_vars": [
         "CLUSTER_MODEL={{ user `cluster_model` }}",
         "CLUSTER_MODEL_REF={{ user `cluster_model_ref` }}",
@@ -51,24 +56,11 @@
       ],
       "type": "shell",
       "expect_disconnect": "true",
-      "override": {
-        "openstack": {
-          "scripts": [
-            "scripts/base.sh",
-            "scripts/network.sh",
-            "scripts/salt_bootstrap.sh",
-            "scripts/salt.sh"
-          ]
-        },
-        "qemu": {
-          "scripts": [
-            "scripts/base.sh",
-            "scripts/network.sh",
-            "scripts/salt_bootstrap.sh",
-            "scripts/salt.sh"
-          ]
-        }
-      }
+      "scripts": [
+        "scripts/base.sh",
+        "scripts/network.sh",
+        "scripts/salt_bootstrap.sh"
+      ]
     },
     {
       "environment_vars": [
@@ -76,18 +68,9 @@
       ],
       "type": "shell",
       "expect_disconnect": "true",
-      "override": {
-        "openstack": {
-          "scripts": [
-            "scripts/salt.sh"
-          ]
-        },
-        "qemu": {
-          "scripts": [
-            "scripts/salt.sh"
-          ]
-        }
-      }
+      "scripts": [
+        "scripts/salt.sh"
+      ]
     },
     {
       "environment_vars": [
@@ -95,23 +78,12 @@
         "MCP_VERSION={{ user `mcp_version` }}"
       ],
       "type": "shell",
-      "pause_before": "180s",
-      "override": {
-        "openstack": {
-          "scripts": [
-            "scripts/mirrors.sh",
-            "scripts/security.sh",
-            "scripts/cleanup.sh"
-          ]
-        },
-        "qemu": {
-          "scripts": [
-            "scripts/mirrors.sh",
-            "scripts/security.sh",
-            "scripts/cleanup.sh"
-          ]
-        }
-      }
+      "pause_before": "120s",
+      "scripts": [
+        "scripts/mirrors.sh",
+        "scripts/security.sh",
+        "scripts/cleanup.sh"
+      ]
     },
     {
       "type": "file",
@@ -131,7 +103,7 @@
       "ssh_password": "{{user `password`}}",
       "image_name": "{{user `image_name`}}",
       "floating_ip_pool": "{{user `floating_ip_pool`}}",
-      "reuse_ips" : "true",
+      "reuse_ips": "true",
       "security_groups": [
         "open_all"
       ],