Merge pull request docker-archive#452 from docker/metafix

Fixed the image name for meta service

Author: FrenchBen

aws/cloudformation/docker_for_aws.json

@@ -561,7 +561,7 @@
                                 "-e MANAGER_SECURITY_GROUP_ID='",{ "Ref" : "ManagerVpcSG" }, "' ",
                                 "-e WORKER_SECURITY_GROUP_ID='",{ "Ref" : "NodeVpcSG" }, "' ",
                                 "-v /var/run/docker.sock:/var/run/docker.sock ",
-                                "docker4x/meta-aws:$DOCKER_FOR_IAAS_VERSION\n",
+                                "docker4x/meta-aws:$DOCKER_FOR_IAAS_VERSION metaserver -flavor=aws\n",
 
                                 "docker run --log-driver=json-file --restart=no -d ",
                                 "-e DYNAMODB_TABLE='", { "Ref" : "SwarmDynDBTable" } , "' ",

aws/cloudformation/docker_for_aws_cloud.json

@@ -586,7 +586,7 @@
                                 "-e MANAGER_SECURITY_GROUP_ID='",{ "Ref" : "ManagerVpcSG" }, "' ",
                                 "-e WORKER_SECURITY_GROUP_ID='",{ "Ref" : "NodeVpcSG" }, "' ",
                                 "-v /var/run/docker.sock:/var/run/docker.sock ",
-                                "kencochrane/meta:latest\n",
+                                "docker4x/meta-aws:$DOCKER_FOR_IAAS_VERSION metaserver -flavor=aws\n",
 
                                 "docker run --log-driver=json-file --restart=no -d ",
                                 "-e DYNAMODB_TABLE='", { "Ref" : "SwarmDynDBTable" } , "' ",

aws/cloudformation/docker_for_aws_ddc.json

@@ -588,7 +588,7 @@
                                 "-e MANAGER_SECURITY_GROUP_ID='",{ "Ref" : "ManagerVpcSG" }, "' ",
                                 "-e WORKER_SECURITY_GROUP_ID='",{ "Ref" : "NodeVpcSG" }, "' ",
                                 "-v /var/run/docker.sock:/var/run/docker.sock ",
-                                "kencochrane/meta:latest\n",
+                                "docker4x/meta-aws:$DOCKER_FOR_IAAS_VERSION metaserver -flavor=aws\n",
 
                                 "docker run --log-driver=json-file --restart=no -d ",
                                 "-e DYNAMODB_TABLE='", { "Ref" : "SwarmDynDBTable" } , "' ",