diff options
Diffstat (limited to 'roles')
| -rw-r--r-- | roles/cockpit-ui/tasks/main.yml | 2 | ||||
| -rw-r--r-- | roles/openshift_cloud_provider/tasks/main.yml | 6 | ||||
| -rw-r--r-- | roles/openshift_cloud_provider/templates/openstack.conf.j2 | 2 |
3 files changed, 8 insertions, 2 deletions
diff --git a/roles/cockpit-ui/tasks/main.yml b/roles/cockpit-ui/tasks/main.yml index 00a7da4a9..c752bcff1 100644 --- a/roles/cockpit-ui/tasks/main.yml +++ b/roles/cockpit-ui/tasks/main.yml @@ -36,7 +36,7 @@ {{ openshift.common.client_binary }} new-app --template=registry-console {{ cockpit_image_prefix }} -p OPENSHIFT_OAUTH_PROVIDER_URL="{{ openshift.master.public_api_url }}" - -p REGISTRY_HOST="{{ docker_registry_route.stdout }}" + -p REGISTRY_HOST="{{ docker_registry_route.stdout }}:80" -p COCKPIT_KUBE_URL="{{ registry_console_cockpit_kube_url.stdout }}" -n default register: deploy_registry_console diff --git a/roles/openshift_cloud_provider/tasks/main.yml b/roles/openshift_cloud_provider/tasks/main.yml index 46549fc75..e217e37ea 100644 --- a/roles/openshift_cloud_provider/tasks/main.yml +++ b/roles/openshift_cloud_provider/tasks/main.yml @@ -1,4 +1,10 @@ --- +- name: Set cloud provider facts + openshift_facts: + role: cloudprovider + local_facts: + kind: "{{ openshift_cloudprovider_kind | default(None) }}" + - name: Create cloudprovider config dir file: path: "{{ openshift.common.config_base }}/cloudprovider" diff --git a/roles/openshift_cloud_provider/templates/openstack.conf.j2 b/roles/openshift_cloud_provider/templates/openstack.conf.j2 index 4e1695b7b..ce452db24 100644 --- a/roles/openshift_cloud_provider/templates/openstack.conf.j2 +++ b/roles/openshift_cloud_provider/templates/openstack.conf.j2 @@ -10,7 +10,7 @@ tenant-name = {{ openshift_cloudprovider_openstack_tenant_name }} {% if openshift_cloudprovider_openstack_region is defined %} region = {{ openshift_cloudprovider_openstack_region }} {% endif %} -{% if 'lb_subnet_id' in openshift_cloudprovider_openstack %} +{% if openshift_cloudprovider_openstack_lb_subnet_id is defined %} [LoadBalancer] subnet-id = {{ openshift_cloudprovider_openstack_lb_subnet_id }} {% endif %} |