Browse Source

kuryr: required pub subnet configuration option

This option was missing and was preventing the ConfigMap rendering from
working.

Change-Id: I4d8b1440f3fe2d20b9637a1fa8e4628d72694f70
Signed-off-by: Antoni Segura Puimedon <antonisp@celebdor.com>
Antoni Segura Puimedon 7 years ago
parent
commit
1a3a0a878c

+ 1 - 0
playbooks/openstack/README.md

@@ -155,6 +155,7 @@ $ vi inventory/group_vars/all.yml
 #os_sdn_network_plugin_name: cni
 #openshift_node_proxy_mode: userspace
 #openshift_hosted_manage_registry: false
+#kuryr_openstack_public_subnet_id: uuid of my public subnet
 ```
 
 

+ 4 - 0
playbooks/openstack/sample-inventory/group_vars/all.yml

@@ -23,6 +23,7 @@ openshift_openstack_external_network_name: "public"
 ## Kuryr networking
 # TODO: Allow the user to specify pre-existing subnets for pod and services
 #openshift_openstack_kuryr_service_subnet_cidr: "172.30.0.0/16"
+
 #
 ## You can alter the port pooling defaults here
 #kuryr_openstack_enable_pools: True
@@ -41,6 +42,9 @@ openshift_openstack_external_network_name: "public"
 # deployed after kuryr is up and running. This can be done with oadm
 # #Disable management of the OpenShift Registry
 #openshift_hosted_manage_registry: false
+# # Kuryr needs to know the subnet you will be taking Floating IPs for the
+# loadbalancer services from.
+# kuryr_openstack_public_subnet_id: uuid_of_my_fip_subnet
 
 # If you VM images will name the ethernet device different than 'eth0',
 # override this

+ 1 - 1
roles/kuryr/templates/configmap.yaml.j2

@@ -293,7 +293,7 @@ data:
     # TODO (apuimedo): Remove the duplicated line just after this one once the
     # RDO packaging contains the upstream patch
     worker_nodes_subnet = {{ kuryr_openstack_worker_nodes_subnet_id }}
-    external_svc_subnet = {{ kuryr_openstack_external_svc_subnet_id }}
+    external_svc_subnet = {{ kuryr_openstack_public_subnet_id }}
 
     [pod_vif_nested]