handle flattening of cert-dir

Author: deads2k

dev_guide/master_node_configuration.adoc

@@ -17,16 +17,16 @@ The config files are fully specifying with no defaulting.  This means that any e
 == Create the starting config files
 The `openshift start` command accepts flags that indicate that it should simply write the config file that it would have used and terminate.  This is useful for getting a starting point for the config.  You can do this by running 
 
-* `openshift start --writeconfig --master-config=master.yaml --node-config=node.yaml`
-* `openshift start master --write-config --config=master.yaml`
-* `openshift start node --write-config --config=node.yaml`
+* `openshift start --writeconfig=openshift.local.config
+* `openshift start master --write-config=openshift.local.config/master`
+* `osadm create-node-config --node-dir=openshift.local.config/node-myhost --node=myhost --hostnames=myhost.local`
 
 == Use the config files
 Once you have modified the config files to your liking, you can make use of them by specifying them as an argument.  Keep in mind that if you specify a config file, *none of the other flags you pass in will be respected*.  You can run them like: 
 
-* `openshift start --master-config=master.yaml --node-config=node.yaml`
-* `openshift start master --config=master.yaml`
-* `openshift start node --config=node.yaml`
+* `openshift start --master-config=openshift.local.config/master/master-config.yaml --node-config=openshift.local.config/node-<node-name>/node-config.yaml`
+* `openshift start master --config=openshift.local.config/master/master-config.yaml`
+* `openshift start node --config=openshift.local.config/node-myhost/node-config.yaml`
 
 == Stub for discussion of generating the config for a new node
 
@@ -38,63 +38,67 @@ This is an example at a point in time.  You should run `--write-config` to gener
 ---
 apiVersion: v1
 assetConfig:
-  kubernetesPublicURL: https://10.0.0.1:8443
   logoutURL: ""
   masterPublicURL: https://10.0.0.1:8443
-  publicURL: https://10.0.0.1:8444
+  publicURL: https://10.0.0.1:8443/console/
   servingInfo:
-    bindAddress: 0.0.0.0:8444
-    certFile: openshift.local.certificates/master/cert.crt
-    clientCA: openshift.local.certificates/ca/cert.crt
-    keyFile: openshift.local.certificates/master/key.key
+    bindAddress: 0.0.0.0:8443
+    certFile: master.server.crt
+    clientCA: ""
+    keyFile: master.server.key
 corsAllowedOrigins:
-- 10.0.0.1:8444
 - 10.0.0.1:8443
-- localhost
 - 127.0.0.1
+- localhost
 dnsConfig:
   bindAddress: 0.0.0.0:53
 etcdClientInfo:
-  ca: openshift.local.certificates/ca/cert.crt
-  certFile: openshift.local.certificates/master/etcd-client.crt
-  keyFile: openshift.local.certificates/master/etcd-client.key
+  ca: ca.crt
+  certFile: master.etcd-client.crt
+  keyFile: master.etcd-client.key
   urls:
   - https://10.0.0.1:4001
 etcdConfig:
   address: 10.0.0.1:4001
   peerAddress: 10.0.0.1:7001
   peerServingInfo:
     bindAddress: 0.0.0.0:7001
-    certFile: openshift.local.certificates/etcd/server.crt
-    clientCA: openshift.local.certificates/ca/cert.crt
-    keyFile: openshift.local.certificates/etcd/server.key
+    certFile: etcd.server.crt
+    clientCA: ca.crt
+    keyFile: etcd.server.key
   servingInfo:
     bindAddress: 0.0.0.0:4001
-    certFile: openshift.local.certificates/etcd/server.crt
-    clientCA: openshift.local.certificates/ca/cert.crt
-    keyFile: openshift.local.certificates/etcd/server.key
+    certFile: etcd.server.crt
+    clientCA: ca.crt
+    keyFile: etcd.server.key
   storageDirectory: openshift.local.etcd
 imageConfig:
   format: openshift/origin-${component}:${version}
   latest: false
 kind: MasterConfig
+kubeletClientInfo:
+  ca: ca.crt
+  certFile: master.kubelet-client.crt
+  keyFile: master.kubelet-client.key
+  port: 10250
 kubernetesMasterConfig:
   masterIP: 10.0.0.1
-  servicesSubnet: 172.30.17.0/24
+  schedulerConfigFile: ""
+  servicesSubnet: 172.30.0.0/16
   staticNodeNames:
-  - hostname.example.org
+  - deads-dev-01
 masterClients:
-  deployerKubeConfig: openshift.local.certificates/openshift-deployer/.kubeconfig
-  kubernetesKubeConfig: openshift.local.certificates/kube-client/.kubeconfig
-  openshiftLoopbackKubeConfig: openshift.local.certificates/openshift-client/.kubeconfig
+  deployerKubeConfig: openshift-deployer.kubeconfig
+  kubernetesKubeConfig: kube-client.kubeconfig
+  openshiftLoopbackKubeConfig: openshift-client.kubeconfig
 oauthConfig:
-  assetPublicURL: https://10.0.0.1:8444
+  assetPublicURL: https://10.0.0.1:8443/console/
   grantConfig:
     method: auto
   identityProviders:
-  - name: anypassword
-    challenge: true
+  - challenge: true
     login: true
+    name: anypassword
     provider:
       apiVersion: v1
       kind: AllowAllPasswordIdentityProvider
@@ -103,45 +107,45 @@ oauthConfig:
   sessionConfig:
     sessionMaxAgeSeconds: 300
     sessionName: ssn
-    sessionSecrets:
-    - authentication: 46b8abfaa1ab450624bef7f4dbb53958
-      encryption: d5c11c48c49d56fa955b96c78b9ae48
+    sessionSecretsFile: ""
   tokenConfig:
-    accessTokenMaxAgeSeconds: 3600
+    accessTokenMaxAgeSeconds: 86400
     authorizeTokenMaxAgeSeconds: 300
 policyConfig:
-  bootstrapPolicyFile: openshift.local.policy/policy.json
+  bootstrapPolicyFile: policy.json
   masterAuthorizationNamespace: master
   openshiftSharedResourcesNamespace: openshift
 servingInfo:
   bindAddress: 0.0.0.0:8443
-  certFile: openshift.local.certificates/master/cert.crt
-  clientCA: openshift.local.certificates/ca/cert.crt
-  keyFile: openshift.local.certificates/master/key.key
+  certFile: master.server.crt
+  clientCA: ca.crt
+  keyFile: master.server.key
 
 ---
 
 === Stub for discussion of what the different values actually do
 
 == Example node.yaml
-This is an example at a point in time.  You should run `--write-config` to generate a file of your own.
+This is an example at a point in time.  You should run `osadm create-node-config` to generate a file of your own.
 
 [source]
 ---
-allowDisabledDocker: true
+allowDisabledDocker: false
 apiVersion: v1
 dnsDomain: local
-dnsIP: 10.0.0.1
+dnsIP: ""
+imageConfig:
+  format: openshift/origin-${component}:${version}
+  latest: false
 kind: NodeConfig
-masterKubeConfig: openshift.local.certificates/node-hostname.example.org/.kubeconfig
-networkContainerImage: openshift/origin-pod:v0.4.1
-nodeName: hostname.example.org
-recordEvents: false
+masterKubeConfig: node.kubeconfig
+networkPluginName: ""
+nodeName: myhost
 servingInfo:
   bindAddress: 0.0.0.0:10250
-  certFile: openshift.local.certificates/node-hostname.example.org/server.crt
-  clientCA: ""
-  keyFile: openshift.local.certificates/node-hostname.example.org/server.key
+  certFile: server.crt
+  clientCA: node-client-ca.crt
+  keyFile: server.key
 volumeDirectory: openshift.local.volumes
 ---
 

getting_started/dev_get_started/installation.adoc

@@ -51,8 +51,8 @@ $ sudo docker exec -it openshift-origin bash
 . Because OpenShift services are secured by TLS, clients must accept the server certificates and present their own client certificate. These certificates are generated when the master server is started. You must point `osc` and `curl` at the appropriate CA bundle and client key and certificate to connect to OpenShift. Set the following environment variables:
 +
 ----
-# export KUBECONFIG=/var/lib/openshift/openshift.local.certificates/admin/.kubeconfig
-# export CURL_CA_BUNDLE=/var/lib/openshift/openshift.local.certificates/admin/root.crt
+# export KUBECONFIG=/var/lib/openshift/openshift.local.config/master/admin.kubeconfig
+# export CURL_CA_BUNDLE=/var/lib/openshift/openshift.local.config/master/ca.crt
 ----
 +
 NOTE: When running as a user other than `root`, you would also need to make the private client key readable by that user. However, this is just for example purposes; in a production environment, developers would generate their own keys and not have access to the system keys.
@@ -104,9 +104,9 @@ $ ./openshift help
 . Because OpenShift services are secured by TLS, clients must accept the server certificates and present their own client certificate. These certificates are generated when the master server is started. You must point `osc` and `curl` at the appropriate CA bundle and client key and certificate to connect to OpenShift. Set the following environment variables:
 +
 ----
-$ export KUBECONFIG=`pwd`/openshift.local.certificates/admin/.kubeconfig
-$ export CURL_CA_BUNDLE=`pwd`/openshift.local.certificates/admin/root.crt
-$ sudo chmod +r `pwd`/openshift.local.certificates/admin/.kubeconfig
+$ export KUBECONFIG=`pwd`/openshift.local.config/master/admin.kubeconfig
+$ export CURL_CA_BUNDLE=`pwd`/openshift.local.config/master/ca.crt
+$ sudo chmod +r `pwd`/openshift.local.config/master/admin.kubeconfig
 ----
 +
 NOTE: This is just for example purposes; in a production environment, developers would generate their own keys and not have access to the system keys.