From 7b316631a2b988318b47d3a50a7b66e3ff3fdbd2 Mon Sep 17 00:00:00 2001 From: Scott Dodson Date: Wed, 10 Jun 2015 10:31:39 -0400 Subject: Update for RC2 changes Remove openshift-deployer.kubeconfig from master template Sync config template Update enterprise image names Switch to node auto registration Add deployer to list of serviceAccountConfig.managedNames Move package installation before registering facts change default kubeconfig location Change system:openshift-client to system:openshift-master Rename node cert/key/kubeconfig per openshift/origin#3160 Update references to /var/lib/openshift/openshift.local.certificates --- README_origin.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'README_origin.md') diff --git a/README_origin.md b/README_origin.md index 5b3fd2435..32287d65c 100644 --- a/README_origin.md +++ b/README_origin.md @@ -19,7 +19,7 @@ * Either ssh key based auth for the root user or ssh key based auth for a user with sudo access (no password) * A checkout of openshift-ansible from https://github.com/openshift/openshift-ansible/ - + ```sh git clone https://github.com/openshift/openshift-ansible.git cd openshift-ansible @@ -92,14 +92,14 @@ inventory file use the -i option for ansible-playbook. On the master host: ```sh openshift ex router --create=true \ - --credentials=/var/lib/openshift/openshift.local.certificates/openshift-router/.kubeconfig + --credentials=/etc/openshift/master/openshift-router.kubeconfig ``` #### Create the default docker-registry On the master host: ```sh openshift ex registry --create=true \ - --credentials=/var/lib/openshift/openshift.local.certificates/openshift-registry/.kubeconfig \ + --credentials=/etc/openshift/master/openshift-registry.kubeconfig \ --mount-host=/var/lib/openshift/docker-registry ``` -- cgit v1.2.3 From c6c6a0d2b609bbe55259fbc6a6c451be63e52b4c Mon Sep 17 00:00:00 2001 From: Scott Dodson Date: Mon, 22 Jun 2015 12:11:35 -0400 Subject: Switch openshift ex router/registry to oadm --- README_origin.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'README_origin.md') diff --git a/README_origin.md b/README_origin.md index 32287d65c..2ccedf4d5 100644 --- a/README_origin.md +++ b/README_origin.md @@ -91,14 +91,14 @@ inventory file use the -i option for ansible-playbook. #### Create the default router On the master host: ```sh -openshift ex router --create=true \ +oadm router --create=true \ --credentials=/etc/openshift/master/openshift-router.kubeconfig ``` #### Create the default docker-registry On the master host: ```sh -openshift ex registry --create=true \ +oadm registry --create=true \ --credentials=/etc/openshift/master/openshift-registry.kubeconfig \ --mount-host=/var/lib/openshift/docker-registry ``` -- cgit v1.2.3 From 96c33e1b6a38a21334abd29fe642a2085e2439cb Mon Sep 17 00:00:00 2001 From: Takayoshi Kimura Date: Fri, 17 Jul 2015 16:22:36 +0900 Subject: Replace outdated beta repo ids with 3.0 release --- README_origin.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'README_origin.md') diff --git a/README_origin.md b/README_origin.md index 2ccedf4d5..fb0931132 100644 --- a/README_origin.md +++ b/README_origin.md @@ -35,7 +35,7 @@ subscription-manager repos --disable="*" subscription-manager repos \ --enable="rhel-7-server-rpms" \ --enable="rhel-7-server-extras-rpms" \ ---enable="rhel-server-7-ose-beta-rpms" +--enable="rhel-7-server-ose-3.0-rpms" ``` * Configuration of router is not automated yet * Configuration of docker-registry is not automated yet -- cgit v1.2.3 From 4fdfe20baf60aadcdad259be84f71d93d5946d2a Mon Sep 17 00:00:00 2001 From: Adam Miller Date: Wed, 29 Jul 2015 10:29:18 -0500 Subject: add link to persistent storage config docs for docker-registry --- README_origin.md | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'README_origin.md') diff --git a/README_origin.md b/README_origin.md index fb0931132..f13fe660a 100644 --- a/README_origin.md +++ b/README_origin.md @@ -99,10 +99,13 @@ oadm router --create=true \ On the master host: ```sh oadm registry --create=true \ - --credentials=/etc/openshift/master/openshift-registry.kubeconfig \ - --mount-host=/var/lib/openshift/docker-registry + --credentials=/etc/openshift/master/openshift-registry.kubeconfig ``` +If you would like persistent storage, refer to the +[OpenShift documentation](https://docs.openshift.org/latest/admin_guide/install/docker_registry.html) +for more information on deployment options for the built in docker-registry. + ## Overriding detected ip addresses and hostnames Some deployments will require that the user override the detected hostnames and ip addresses for the hosts. To see what the default values will be you can -- cgit v1.2.3 From 0497eac6ad52db6aefc947d2ecb5843c42b236da Mon Sep 17 00:00:00 2001 From: Adam Miller Date: Wed, 5 Aug 2015 09:53:37 -0500 Subject: namespace the byo inventory so the group names aren't so generic --- README_origin.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'README_origin.md') diff --git a/README_origin.md b/README_origin.md index f13fe660a..a30ad2c71 100644 --- a/README_origin.md +++ b/README_origin.md @@ -54,8 +54,8 @@ option to ansible-playbook. # Create an OSEv3 group that contains the masters and nodes groups [OSv3:children] -masters -nodes +openshift_masters +openshift_nodes # Set variables common for all OSEv3 hosts [OSv3:vars] @@ -68,11 +68,11 @@ ansible_ssh_user=root deployment_type=origin # host group for masters -[masters] +[openshift_masters] osv3-master.example.com # host group for nodes -[nodes] +[openshift_nodes] osv3-node[1:2].example.com ``` @@ -207,7 +207,7 @@ what we expect them to be (if not, we can override them). To override the the defaults, you can set the variables in your inventory: ``` ...snip... -[masters] +[openshift_masters] osv3-master.example.com openshift_ip=1.1.1.1 openshift_hostname=osv3-master.example.com openshift_public_ip=2.2.2.2 openshift_public_hostname=osv3-master.public.example.com ...snip... ``` -- cgit v1.2.3 From 517557bd7e7bf22c5ccfc226df32e86dab70940a Mon Sep 17 00:00:00 2001 From: Scott Dodson Date: Thu, 6 Aug 2015 12:26:49 -0400 Subject: Revert "namespace the byo inventory so the group names aren't so generic" --- README_origin.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'README_origin.md') diff --git a/README_origin.md b/README_origin.md index a30ad2c71..f13fe660a 100644 --- a/README_origin.md +++ b/README_origin.md @@ -54,8 +54,8 @@ option to ansible-playbook. # Create an OSEv3 group that contains the masters and nodes groups [OSv3:children] -openshift_masters -openshift_nodes +masters +nodes # Set variables common for all OSEv3 hosts [OSv3:vars] @@ -68,11 +68,11 @@ ansible_ssh_user=root deployment_type=origin # host group for masters -[openshift_masters] +[masters] osv3-master.example.com # host group for nodes -[openshift_nodes] +[nodes] osv3-node[1:2].example.com ``` @@ -207,7 +207,7 @@ what we expect them to be (if not, we can override them). To override the the defaults, you can set the variables in your inventory: ``` ...snip... -[openshift_masters] +[masters] osv3-master.example.com openshift_ip=1.1.1.1 openshift_hostname=osv3-master.example.com openshift_public_ip=2.2.2.2 openshift_public_hostname=osv3-master.public.example.com ...snip... ``` -- cgit v1.2.3 From 902b9c5c77b4031fb9ebcdcd02fbbe6e07f59e72 Mon Sep 17 00:00:00 2001 From: Andrew Butcher Date: Wed, 30 Sep 2015 10:15:01 -0400 Subject: Point to advanced installation guide in READMEs --- README_origin.md | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) (limited to 'README_origin.md') diff --git a/README_origin.md b/README_origin.md index f13fe660a..cb213a93a 100644 --- a/README_origin.md +++ b/README_origin.md @@ -73,6 +73,7 @@ osv3-master.example.com # host group for nodes [nodes] +osv3-master.example.com osv3-node[1:2].example.com ``` @@ -88,23 +89,8 @@ ansible-playbook playbooks/byo/config.yml inventory file use the -i option for ansible-playbook. ## Post-ansible steps -#### Create the default router -On the master host: -```sh -oadm router --create=true \ - --credentials=/etc/openshift/master/openshift-router.kubeconfig -``` - -#### Create the default docker-registry -On the master host: -```sh -oadm registry --create=true \ - --credentials=/etc/openshift/master/openshift-registry.kubeconfig -``` -If you would like persistent storage, refer to the -[OpenShift documentation](https://docs.openshift.org/latest/admin_guide/install/docker_registry.html) -for more information on deployment options for the built in docker-registry. +You should now be ready to follow the [What's Next?](https://docs.openshift.org/latest/install_config/install/advanced_install.html#what-s-next) section of the advanced installation guide to deploy your router, registry, and other components. ## Overriding detected ip addresses and hostnames Some deployments will require that the user override the detected hostnames -- cgit v1.2.3