Jelajahi Sumber

openstack: make master direct Octavia compatible

The previous commits made the heat stack direct to Octavia Compatible.
This one handles the master.

Change-Id: Ie2c26071e610dede382f802fe67a2c1acb88591e
Signed-off-by: Antoni Segura Puimedon <antonisp@celebdor.com>
Antoni Segura Puimedon 7 tahun lalu
induk
melakukan
9c09668d5a

+ 3 - 3
roles/openshift_openstack/templates/heat_stack_server.yaml.j2

@@ -332,7 +332,7 @@ resources:
 
 
   api_lb_member:
-    type: OS::Neutron::LBaaS::PoolMember
+    type: OS::{{ openshift_openstack_lbaasv2_provider }}::PoolMember
     condition:
       not: {equals: [{get_param: api_lb_pool}, ""]}
     properties:
@@ -344,7 +344,7 @@ resources:
   router_lb_pool_member_http:
     condition:
       not: {equals: [{get_param: router_lb_pool_http}, ""]}
-    type: OS::Neutron::LBaaS::PoolMember
+    type: OS::{{ openshift_openstack_lbaasv2_provider }}::PoolMember
     properties:
       pool: { get_param: router_lb_pool_http }
       protocol_port: 80
@@ -354,7 +354,7 @@ resources:
   router_lb_pool_member_https:
     condition:
       not: {equals: [{get_param: router_lb_pool_https}, ""]}
-    type: OS::Neutron::LBaaS::PoolMember
+    type: OS::{{ openshift_openstack_lbaasv2_provider }}::PoolMember
     properties:
       pool: { get_param: router_lb_pool_https }
       protocol_port: 443