Merge "Fix template validation"

2014-08-12 22:46:58 +00:00 · 2014-08-12 22:46:58 +00:00 · e9d97c4303
parent 6d3c49b441 6aa7391ce8
commit e9d97c4303
4 changed files with 2 additions and 2 deletions
--- a/cfn/F17/WordPress_Single_Instance_gold.template
+++ b/cfn/F17/WordPress_Single_Instance_gold.template
@ -77,7 +77,7 @@
      "m1.xlarge"   : { "Arch" : "64" }
    },
    "DistroArch2AMI": {
-      "F17"      : { "32" : "F17-i386-gold", "64" : "F17-x86_64-gold" },
+      "F17"      : { "32" : "F17-i386-gold", "64" : "F17-x86_64-gold" }
    }
  },

--- a/openshift-origin/centos65/highly-available/oso_ha_stack.yaml
+++ b/openshift-origin/centos65/highly-available/oso_ha_stack.yaml
--- a/openshift-origin/centos65/highly-available/oso_ha_env.yaml
+++ b/openshift-origin/centos65/highly-available/oso_ha_env.yaml
@ -20,4 +20,4 @@ parameters:
  public_net_id: c5882794-fa7d-46b2-b90a-e37e47fabdf8
  private_subnet_id: 8977e24c-32c6-4fb1-ae9f-6f70c16ecf0d
 resource_registry:
-  OpenShift::Node::Server: oso_node_stack.yaml
+  OpenShift::Node::Server: oso_node.yaml
--- a/openshift-origin/centos65/highly-available/oso_node_stack.yaml
+++ b/openshift-origin/centos65/highly-available/oso_node_stack.yaml