Skip to content

Fixes for OCP install #8003

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Apr 18, 2018
Merged

Fixes for OCP install #8003

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0de9341
Fix up node and control-plane images
sdodson Apr 17, 2018
3d5a883
Create docker cert dir for our registry
sdodson Apr 17, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 1 addition & 7 deletions roles/openshift_control_plane/defaults/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,7 @@ l_openshift_images_dict:
l_osm_registry_url_default: "{{ l_openshift_images_dict[openshift_deployment_type] }}"
l_os_registry_url: "{{ oreg_url_master | default(oreg_url) | default(l_osm_registry_url_default) | regex_replace('${version}' | regex_escape, openshift_image_tag | default('${version}')) }}"

l_openshift_prefix_dict:
origin: 'origin-${component}'
openshift-enterprise: 'ose-${component}'
l_os_prefix: "{{ l_openshift_prefix_dict[openshift_deployment_type] }}"
l_os_prefix_base: "{{ l_openshift_prefix_dict[openshift_deployment_type] | regex_replace('-${component}' | regex_escape, '') }}"
# TODO: we should publish oreg_url component=master
osm_image: "{{ l_os_registry_url | regex_replace(l_os_prefix | regex_escape, l_os_prefix_base) }}"
osm_image: "{{ l_os_registry_url | regex_replace('${component}' | regex_escape, 'control-plane') }}"

system_images_registry_dict:
openshift-enterprise: "registry.access.redhat.com"
Expand Down
7 changes: 1 addition & 6 deletions roles/openshift_node/defaults/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,7 @@ l_openshift_images_dict:
l_osm_registry_url_default: "{{ l_openshift_images_dict[openshift_deployment_type] }}"
l_os_registry_url: "{{ oreg_url | default(l_osm_registry_url_default) | regex_replace('${version}' | regex_escape, openshift_image_tag | default('${version}')) }}"

l_openshift_prefix_dict:
origin: 'origin-${component}'
openshift-enterprise: 'ose-${component}'
l_os_prefix: "{{ l_openshift_prefix_dict[openshift_deployment_type] }}"
# TODO: we should publish oreg_url component=node
osn_image_default: "{{ l_os_registry_url | regex_replace(l_os_prefix | regex_escape, 'node') }}"
osn_image_default: "{{ l_os_registry_url | regex_replace('${component}' | regex_escape, 'node') }}"
osn_image: "{{ (system_images_registry == 'docker') | ternary(osn_image_default, (osn_image_default.split('/')|length==2) | ternary(system_images_registry + '/' + osn_image_default, osn_image_default)) }}"
system_osn_image: "{{ (system_images_registry == 'docker') | ternary('docker:' + osn_image, osn_image) }}"

Expand Down
10 changes: 10 additions & 0 deletions roles/openshift_node/tasks/upgrade/config_changes.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,23 @@
path: "{{ openshift.common.config_base }}/node/pods"
state: directory
mode: 0755
- name: Check for client-ca.crt
stat:
path: "{{ openshift_node_config_dir }}/client-ca.crt"
register: client_ca_crt

- name: Ensure docker-registry directory exists
file:
state: directory
path: "/etc/docker/certs.d/docker-registry.default.svc:5000"

- name: Update the docker-registry CA symlink
file:
src: "{{ openshift_node_config_dir }}/client-ca.crt"
dest: "/etc/docker/certs.d/docker-registry.default.svc:5000/node-client-ca.crt"
state: link
force: yes
when: client_ca_crt.stat.exists

- name: Update node-config for static pods
yedit:
Expand Down
2 changes: 1 addition & 1 deletion roles/openshift_sdn/defaults/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,6 @@ l_openshift_prefix_dict:
openshift-enterprise: 'ose-${component}'
l_os_prefix: "{{ l_openshift_prefix_dict[openshift_deployment_type] }}"
# TODO: we should publish oreg_url component=node
osn_image: "{{ l_os_registry_url | regex_replace(l_os_prefix | regex_escape, 'node') }}"
osn_image: "{{ l_os_registry_url | regex_replace('${component}' | regex_escape, 'node') }}"

openshift_use_external_openvswitch: false