From b1f99916176560d9c5f1e7f43fc5422218b0c5d7 Mon Sep 17 00:00:00 2001 From: Rodolfo Carvalho Date: Wed, 29 Mar 2017 16:20:17 +0200 Subject: Remove outdated build instructions - The spec file from ./inventory was removed back on Oct 28, 2015. See aa2d0ed3fbd9b140c66a054fd3cfd8976de592ce. - The remaining instructions refer to the `openshift-ansible` package, not `openshift-ansible-bin`. --- BUILD.md | 24 +++--------------------- 1 file changed, 3 insertions(+), 21 deletions(-) diff --git a/BUILD.md b/BUILD.md index 15d3d6240..38f8f38e3 100644 --- a/BUILD.md +++ b/BUILD.md @@ -1,10 +1,12 @@ # openshift-ansible RPM Build instructions + We use tito to make building and tracking revisions easy. For more information on tito, please see the [Tito home page](https://github.com/dgoodwin/tito "Tito home page"). -## Build openshift-ansible-bin +## Build openshift-ansible + - Change into openshift-ansible ``` cd openshift-ansible @@ -22,23 +24,3 @@ tito tag ``` tito build --rpm ``` - - -## Build openshift-ansible-inventory -- Change into openshift-ansible/inventory -``` -cd openshift-ansible/inventory -``` -- Build a test package (no tagging needed) -``` -tito build --test --rpm -``` -- Tag a new build (bumps version number and adds log entries) -``` -tito tag -``` -- Follow the on screen tito instructions to push the tags -- Build a new package based on the latest tag information -``` -tito build --rpm -``` -- cgit v1.2.3 From 7fd854bda49e1a6b2fea951f2605e4b9dbd062f2 Mon Sep 17 00:00:00 2001 From: Rodolfo Carvalho Date: Wed, 29 Mar 2017 16:28:45 +0200 Subject: Remove outdated documentation This documentation was about a previous Dockerfile that was based on RHEL and not easily buildable by people cloning this repository. The new Dockerfile, with images available at https://hub.docker.com/r/openshift/openshift-ansible/, is documented in README_CONTAINER_IMAGE.md. --- README_ANSIBLE_CONTAINER.md | 15 --------------- 1 file changed, 15 deletions(-) delete mode 100644 README_ANSIBLE_CONTAINER.md diff --git a/README_ANSIBLE_CONTAINER.md b/README_ANSIBLE_CONTAINER.md deleted file mode 100644 index 30c5f8503..000000000 --- a/README_ANSIBLE_CONTAINER.md +++ /dev/null @@ -1,15 +0,0 @@ -# Running ansible in a docker container -* Building ansible container: - - ```sh - git clone https://github.com/openshift/openshift-ansible.git - cd openshift-ansible - docker build --rm -t ansible . - ``` -* Create /etc/ansible directory on the host machine and copy inventory file (hosts) into it. -* Copy ssh public key of the host machine to master and nodes machines in the cluster. -* Running the ansible container: - - ```sh - docker run -it --rm --privileged --net=host -v ~/.ssh:/root/.ssh -v /etc/ansible:/etc/ansible ansible - ``` -- cgit v1.2.3 From 61d1a8ccbe90373a4ae7f0e3e5ba7a98d0a87132 Mon Sep 17 00:00:00 2001 From: Rodolfo Carvalho Date: Fri, 7 Apr 2017 15:25:27 +0200 Subject: Document merge time trends page --- CONTRIBUTING.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 50bb09470..a3ae3fd10 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -200,6 +200,9 @@ test results are posted to S3 buckets when complete. The test output of each job is also posted to the Pull Request as comments. +A trend of the time taken by merge jobs is available at +https://ci.openshift.redhat.com/jenkins/job/merge_pull_request_openshift_ansible/buildTimeTrend. + --- ## Appendix -- cgit v1.2.3 From 79456a702e201c32aa6709dd767c84e70945f451 Mon Sep 17 00:00:00 2001 From: Rodolfo Carvalho Date: Wed, 29 Mar 2017 16:46:54 +0200 Subject: Update deployment_type documentation --- DEPLOYMENT_TYPES.md | 32 +++++++++++++++++--------------- README_CONTAINERIZED_INSTALLATION.md | 2 +- inventory/byo/hosts.origin.example | 2 +- inventory/byo/hosts.ose.example | 2 +- roles/openshift_repos/README.md | 8 ++++---- 5 files changed, 24 insertions(+), 22 deletions(-) diff --git a/DEPLOYMENT_TYPES.md b/DEPLOYMENT_TYPES.md index 42ac5635a..3ad7f05b3 100644 --- a/DEPLOYMENT_TYPES.md +++ b/DEPLOYMENT_TYPES.md @@ -1,22 +1,24 @@ -#Deployment Types +# Deployment Types -This module supports OpenShift Origin and OpenShift Enterprise Each deployment -type sets various defaults used throughout your environment. +This repository supports OpenShift Origin and OpenShift Container Platform. -The table below outlines the defaults per `deployment_type`. +Various defaults used throughout the playbooks and roles in this repository are +set based on the deployment type configuration (usually defined in an Ansible +hosts file). -| deployment_type | origin | enterprise (< 3.1) | openshift-enterprise (>= 3.1) | -|-----------------------------------------------------------------|------------------------------------------|----------------------------------------|----------------------------------| -| **openshift.common.service_type** (also used for package names) | origin | openshift | | -| **openshift.common.config_base** | /etc/origin | /etc/openshift | /etc/origin | -| **openshift.common.data_dir** | /var/lib/origin | /var/lib/openshift | /var/lib/origin | -| **openshift.master.registry_url openshift.node.registry_url** | openshift/origin-${component}:${version} | openshift3/ose-${component}:${version} | aos3/aos-${component}:${version} | -| **Image Streams** | centos | rhel + xpaas | rhel | +The table below outlines the defaults per `openshift_deployment_type`: +| openshift_deployment_type | origin | enterprise (< 3.1) | openshift-enterprise (>= 3.1) | +|-----------------------------------------------------------------|------------------------------------------|----------------------------------------|----------------------------------------| +| **openshift.common.service_type** (also used for package names) | origin | openshift | | +| **openshift.common.config_base** | /etc/origin | /etc/openshift | /etc/origin | +| **openshift.common.data_dir** | /var/lib/origin | /var/lib/openshift | /var/lib/origin | +| **openshift.master.registry_url openshift.node.registry_url** | openshift/origin-${component}:${version} | openshift3/ose-${component}:${version} | openshift3/ose-${component}:${version} | +| **Image Streams** | centos | rhel + xpaas | rhel | -**NOTE** `enterprise` deployment type is used for OpenShift Enterprise version -3.0.x OpenShift Enterprise deployments utilizing version 3.1 and later will -make use of the new `openshift-enterprise` deployment type. Additional work to -migrate between the two will be forthcoming. +**NOTES**: +- `enterprise` deployment type is used for OpenShift Enterprise version +3.0.x. +- `openshift-enterprise` deployment type is used for OpenShift Enterprise (and now OpenShift Container Platform) version 3.1 and later. diff --git a/README_CONTAINERIZED_INSTALLATION.md b/README_CONTAINERIZED_INSTALLATION.md index 5e013e809..c697783e3 100644 --- a/README_CONTAINERIZED_INSTALLATION.md +++ b/README_CONTAINERIZED_INSTALLATION.md @@ -38,7 +38,7 @@ and _/tmp_. Be mindful of this when passing in files to be processed by `oc` or ### Requisite Images -Based on your deployment_type the installer will make use of the following +Based on your `openshift_deployment_type` the installer will make use of the following images. Because you may make use of a private repository we've moved the configuration of docker additional, insecure, and blocked registries to the beginning of the installation process ensuring that these settings are applied diff --git a/inventory/byo/hosts.origin.example b/inventory/byo/hosts.origin.example index 27914e60a..a99423411 100644 --- a/inventory/byo/hosts.origin.example +++ b/inventory/byo/hosts.origin.example @@ -22,7 +22,7 @@ ansible_ssh_user=root # Debug level for all OpenShift components (Defaults to 2) debug_level=2 -# deployment type valid values are origin, online, atomic-enterprise and openshift-enterprise +# Specify the deployment type. Valid values are origin and openshift-enterprise. openshift_deployment_type=origin # Specify the generic release of OpenShift to install. This is used mainly just during installation, after which we diff --git a/inventory/byo/hosts.ose.example b/inventory/byo/hosts.ose.example index f0269bff8..9774aa66b 100644 --- a/inventory/byo/hosts.ose.example +++ b/inventory/byo/hosts.ose.example @@ -22,7 +22,7 @@ ansible_ssh_user=root # Debug level for all OpenShift components (Defaults to 2) debug_level=2 -# deployment type valid values are origin, online, atomic-enterprise, and openshift-enterprise +# Specify the deployment type. Valid values are origin and openshift-enterprise. openshift_deployment_type=openshift-enterprise # Specify the generic release of OpenShift to install. This is used mainly just during installation, after which we diff --git a/roles/openshift_repos/README.md b/roles/openshift_repos/README.md index 95b155b29..abd1997dd 100644 --- a/roles/openshift_repos/README.md +++ b/roles/openshift_repos/README.md @@ -12,10 +12,10 @@ rhel-7-server-extra-rpms, and rhel-7-server-ose-3.0-rpms repos. Role Variables -------------- -| Name | Default value | | -|-------------------------------|---------------|----------------------------------------------| -| openshift_deployment_type | None | Possible values enterprise, origin, online | -| openshift_additional_repos | {} | TODO | +| Name | Default value | | +|-------------------------------|---------------|------------------------------------| +| openshift_deployment_type | None | Possible values enterprise, origin | +| openshift_additional_repos | {} | TODO | Dependencies ------------ -- cgit v1.2.3 From 5373cc05c96e6faa440068ce2b3b222831623112 Mon Sep 17 00:00:00 2001 From: Rodolfo Carvalho Date: Tue, 11 Apr 2017 13:16:18 +0200 Subject: Remove references to outdated deployment_type 'enterprise' is not used anymore (since 3.1) and thus can be safely omitted for avoiding confusion. --- DEPLOYMENT_TYPES.md | 21 +++++++-------------- 1 file changed, 7 insertions(+), 14 deletions(-) diff --git a/DEPLOYMENT_TYPES.md b/DEPLOYMENT_TYPES.md index 3ad7f05b3..417f8b6ab 100644 --- a/DEPLOYMENT_TYPES.md +++ b/DEPLOYMENT_TYPES.md @@ -8,17 +8,10 @@ hosts file). The table below outlines the defaults per `openshift_deployment_type`: -| openshift_deployment_type | origin | enterprise (< 3.1) | openshift-enterprise (>= 3.1) | -|-----------------------------------------------------------------|------------------------------------------|----------------------------------------|----------------------------------------| -| **openshift.common.service_type** (also used for package names) | origin | openshift | | -| **openshift.common.config_base** | /etc/origin | /etc/openshift | /etc/origin | -| **openshift.common.data_dir** | /var/lib/origin | /var/lib/openshift | /var/lib/origin | -| **openshift.master.registry_url openshift.node.registry_url** | openshift/origin-${component}:${version} | openshift3/ose-${component}:${version} | openshift3/ose-${component}:${version} | -| **Image Streams** | centos | rhel + xpaas | rhel | - - -**NOTES**: - -- `enterprise` deployment type is used for OpenShift Enterprise version -3.0.x. -- `openshift-enterprise` deployment type is used for OpenShift Enterprise (and now OpenShift Container Platform) version 3.1 and later. +| openshift_deployment_type | origin | openshift-enterprise | +|-----------------------------------------------------------------|------------------------------------------|----------------------------------------| +| **openshift.common.service_type** (also used for package names) | origin | | +| **openshift.common.config_base** | /etc/origin | /etc/origin | +| **openshift.common.data_dir** | /var/lib/origin | /var/lib/origin | +| **openshift.master.registry_url openshift.node.registry_url** | openshift/origin-${component}:${version} | openshift3/ose-${component}:${version} | +| **Image Streams** | centos | rhel | -- cgit v1.2.3 From 69fb4f0e741b09d21f14a4533193b0aa05df1b10 Mon Sep 17 00:00:00 2001 From: Rodolfo Carvalho Date: Tue, 11 Apr 2017 13:18:09 +0200 Subject: Document service_type for openshift-enterprise Based on source code in roles/openshift_facts/library/openshift_facts.py --- DEPLOYMENT_TYPES.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DEPLOYMENT_TYPES.md b/DEPLOYMENT_TYPES.md index 417f8b6ab..009a1d95c 100644 --- a/DEPLOYMENT_TYPES.md +++ b/DEPLOYMENT_TYPES.md @@ -10,7 +10,7 @@ The table below outlines the defaults per `openshift_deployment_type`: | openshift_deployment_type | origin | openshift-enterprise | |-----------------------------------------------------------------|------------------------------------------|----------------------------------------| -| **openshift.common.service_type** (also used for package names) | origin | | +| **openshift.common.service_type** (also used for package names) | origin | atomic-openshift | | **openshift.common.config_base** | /etc/origin | /etc/origin | | **openshift.common.data_dir** | /var/lib/origin | /var/lib/origin | | **openshift.master.registry_url openshift.node.registry_url** | openshift/origin-${component}:${version} | openshift3/ose-${component}:${version} | -- cgit v1.2.3