Browse Source

Merge pull request #9289 from tzumainn/openstack-kuryr-registry-doc-update

Remove kuryr documentation that tells user to disable registry creation
Scott Dodson 6 years ago
parent
commit
0df8825ee6

+ 0 - 16
playbooks/openstack/configuration.md

@@ -478,7 +478,6 @@ openshift_use_kuryr: true
 openshift_use_openshift_sdn: false
 os_sdn_network_plugin_name: cni
 openshift_node_proxy_mode: userspace
-openshift_hosted_manage_registry: false
 use_trunk_ports: true
 
 openshift_master_open_ports:
@@ -589,21 +588,6 @@ openshift_kuryr_subnet_driver: namespace
 ```
 
 
-### Deploying OpenShift Registry
-
-Since we've disabled the OpenShift registry creation, you will have to create
-it manually afterwards. SSH to a master node and run this as root:
-
-```yaml
-oadm registry --config=/etc/origin/master/admin.kubeconfig --service-account=registry
-```
-
-For more information (e.g. how to use a specific storage backend), please
-follow the OpenShift documentation on the registry:
-
-https://docs.openshift.org/latest/install_config/registry/index.html
-
-
 ### Kuryr Controller and CNI healthchecks probes
 
 By default kuryr controller and cni pods are deployed with readiness and

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

@@ -43,10 +43,6 @@ openshift_openstack_external_network_name: "public"
 #use_trunk_ports: True
 #os_sdn_network_plugin_name: cni
 #openshift_node_proxy_mode: userspace
-# # Kuryr needs to have the pod based registry (if desired in the cluster)
-# 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 network or the subnet you will be taking Floating
 # IPs for the loadbalancer services from.