Merge pull request #271 from lebauce/rhel-lb-image

jprovaznik · web-flow · commit 275d12be1525 · 2016-10-11T14:54:52.000+02:00
Set load balancer image to rhel when using AOP
diff --git a/env_aop.yaml b/env_aop.yaml
@@ -8,6 +8,8 @@ parameters:
   infra_flavor: m1.medium
   node_image: rhel72
   node_flavor: m1.medium
+  loadbalancer_image: rhel72
+  loadbalancer_flavor: m1.medium
 
   external_network: ext_net
   dns_nameserver: 8.8.4.4,8.8.8.8
diff --git a/env_loadbalancer_dedicated.yaml b/env_loadbalancer_dedicated.yaml
@@ -1,9 +1,5 @@
 parameters:
     loadbalancer_type: dedicated
-    # once openshift-ansible supports containerzed loadbalancer node setup
-    # this can be deleted
-    loadbalancer_image: centos72
-    loadbalancer_flavor: m1.medium
 
 resource_registry:
     OOShift::LoadBalancer: loadbalancer_dedicated.yaml
diff --git a/env_origin.yaml b/env_origin.yaml
@@ -8,6 +8,8 @@ parameters:
   infra_flavor: m1.medium
   node_image: centos72
   node_flavor: m1.medium
+  loadbalancer_image: centos72
+  loadbalancer_flavor: m1.medium
   external_network: ext_net
   dns_nameserver: 8.8.4.4,8.8.8.8
   node_count: 2
diff --git a/openshift.yaml b/openshift.yaml
@@ -52,6 +52,8 @@ parameters:
     constraints:
     - custom_constraint: glance.image
 
+  # once openshift-ansible supports containerized loadbalancer node setup
+  # this can be deleted
   loadbalancer_image:
     description: >
       Select a base image to use for the loadbalancer nodes, this is required
