Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
158 commits
Select commit Hold shift + click to select a range
cbc1f4c
WIP: Scale node to new-installer cluster
michaelgugino Sep 28, 2018
39a350f
Add additional parse_igintion options and support
michaelgugino Oct 3, 2018
9143870
Update dependencies: add google-auth and use latest ansible
Nov 2, 2018
5a15a1f
Rework base roles, add openshift_node40 role
Nov 2, 2018
651d26c
Add playbooks to setup cluster via bootkube and scale up nodes
Nov 2, 2018
913347a
Merge pull request #10587 from vrutkovs/bootkube-gcp
openshift-merge-robot Nov 6, 2018
a450a3e
Dockerfile: fix pip install params
Nov 7, 2018
960f832
Set default values for openshift_gcp_master_healthcheck_port and open…
Nov 7, 2018
fa9e932
crio-firewall: install iptables
Nov 7, 2018
e137143
test/gcp: copy kubeconfig back to /tmp so that tests on CI could proceed
Nov 7, 2018
3920c40
Merge pull request #10627 from vrutkovs/40-ci-fixes
openshift-merge-robot Nov 9, 2018
ac07e6b
Move install steps into playbooks
michaelgugino Nov 8, 2018
c937c33
Merge pull request #10643 from mgugino-upstream-stage/new-plays
openshift-merge-robot Nov 9, 2018
6382c6e
Enhance parse_ignition file content decoding
michaelgugino Nov 20, 2018
f42f671
Merge pull request #10732 from mgugino-upstream-stage/parse-ign-decode
openshift-merge-robot Nov 21, 2018
feb489a
Automatic commit of package [openshift-ansible] release [4.0.0-0.84.0].
Dec 5, 2018
b80459e
Automatic commit of package [openshift-ansible] release [4.0.0-0.85.0].
Dec 6, 2018
2870908
Automatic commit of package [openshift-ansible] release [4.0.0-0.86.0].
Dec 6, 2018
9d08aae
Automatic commit of package [openshift-ansible] release [4.0.0-0.87.0].
Dec 6, 2018
5be5ae4
Automatic commit of package [openshift-ansible] release [4.0.0-0.88.0].
Dec 6, 2018
bbff73a
Automatic commit of package [openshift-ansible] release [4.0.0-0.89.0].
Dec 7, 2018
79f401b
Automatic commit of package [openshift-ansible] release [4.0.0-0.90.0].
Dec 7, 2018
20a7489
Automatic commit of package [openshift-ansible] release [4.0.0-0.91.0].
Dec 8, 2018
bebe82a
Automatic commit of package [openshift-ansible] release [4.0.0-0.92.0].
Dec 8, 2018
4df7fda
Automatic commit of package [openshift-ansible] release [4.0.0-0.93.0].
Dec 9, 2018
532161a
Automatic commit of package [openshift-ansible] release [4.0.0-0.94.0].
Dec 10, 2018
87495a0
Dockerfile.rhel7: remove superfluous labels
sosiouxme Nov 23, 2018
5a8f148
Automatic commit of package [openshift-ansible] release [4.0.0-0.95.0].
Dec 11, 2018
1f3e9db
DEBUG: skip openshift-apiserver operator
vrutkovs Dec 11, 2018
df0e377
Automatic commit of package [openshift-ansible] release [4.0.0-0.96.0].
Dec 12, 2018
a038d7d
Use ansible 2.7.4
vrutkovs Dec 6, 2018
5a02a2e
Merge branch 'devel-40' into devel-40-master-rebase
vrutkovs Dec 13, 2018
6cae052
Merge pull request #10877 from vrutkovs/devel-40-master-rebase
openshift-merge-robot Dec 13, 2018
a2f9001
Add libvirt terraform testing scripts
michaelgugino Dec 12, 2018
8d81d41
Add inventory generation
michaelgugino Dec 12, 2018
07a17b3
WIP: libvirt testing work
michaelgugino Dec 13, 2018
6ab44c3
fixes
michaelgugino Dec 13, 2018
32321dd
test
sdodson Dec 13, 2018
c23be06
update gitignore
michaelgugino Dec 13, 2018
3824c9c
Check CVO status instead of particular operators
Dec 14, 2018
1ccb696
Merge pull request #10886 from vrutkovs/devel-40-check-cvo
sdodson Dec 14, 2018
c4f28fa
Use mcd_endpoint in deploy_cluster_40 playbook
Dec 14, 2018
c0ede0d
Test MCS endpoint on bootstrap to fail early if its unavailable and c…
Dec 14, 2018
239f75d
Collect a list of containers on bootstrap node and show their logs
Dec 14, 2018
eeb038c
Update GCP provisioning variable.
michaelgugino Dec 18, 2018
24fe880
Merge pull request #10880 from mgugino-upstream-stage/install-config-…
sdodson Dec 18, 2018
bce1818
Merge branch 'devel-40' into devel-40-bootkube-logs
sdodson Dec 18, 2018
6aa5749
support worker node scaleup
michaelgugino Dec 17, 2018
4a8c5ce
Change byo network and add CentOS support
michaelgugino Dec 17, 2018
5d877fe
Merge pull request #10895 from mgugino-upstream-stage/40-scaleup
openshift-merge-robot Dec 19, 2018
8b989b8
Install node package names based on openshift_release
jstuever Dec 18, 2018
598ec8e
Add proper 4.0 README steps
michaelgugino Dec 19, 2018
f5e12a2
Merge pull request #10898 from mgugino-upstream-stage/40-new-net
sdodson Dec 19, 2018
0a2ba31
Merge pull request #10901 from jstuever/dev/jstuever/node40_service_type
sdodson Dec 19, 2018
798c5e3
add examples
michaelgugino Dec 19, 2018
d7fe285
Merge pull request #10885 from vrutkovs/devel-40-bootkube-logs
openshift-merge-robot Dec 21, 2018
541420f
Merge pull request #10909 from mgugino-upstream-stage/update-readme-40
sdodson Jan 2, 2019
d810d67
[libvirt] Set workers replicas to 1 for now
sdodson Jan 2, 2019
dbb24ca
Merge pull request #10942 from sdodson/devel-40-replicas-1
sdodson Jan 2, 2019
d229d0d
libvirt - Add ingress reconfig steps
sdodson Jan 9, 2019
dfd1790
Add a note about future state where the operator does the right thing
sdodson Jan 9, 2019
8e2a7b5
Merge pull request #10978 from sdodson/devel-40-ingress
sdodson Jan 23, 2019
a97aa89
Fix documentation for oc - modules
Jan 18, 2019
e10cc17
Add test playbooks to verify new RHEL nodes can be added to AWS RHCOS
Jan 10, 2019
84b7199
Merge pull request #10985 from vrutkovs/devel-40-scaleup-ci
sdodson Jan 29, 2019
8e04239
Add openshift_bootstrap_endpoint for scaleup.
jstuever Jan 21, 2019
5ab5237
Merge pull request #11045 from jstuever/byoh159
sdodson Jan 31, 2019
c0317fc
Remove unused playbooks in 4.x
jstuever Jan 30, 2019
d165db6
Remove unused roles in 4.x
jstuever Jan 30, 2019
80a3d83
openshift_node40: cleanup unused bits
jstuever Jan 30, 2019
3c7dbc6
container_runtime: cleanup unused bits
jstuever Jan 31, 2019
ae79682
openshift_version: merge into init/version.yml.
jstuever Jan 31, 2019
f073161
openshift-ansible.spec: remove contiv role.
jstuever Feb 5, 2019
c627cab
test/aws: use machinesets.machine.openshift.io kind
Feb 7, 2019
a7626e7
test/aws: use machines.machine.openshift.io kind
Feb 8, 2019
e656292
Merge pull request #11140 from vrutkovs/devel-40-machineset-wait
sdodson Feb 11, 2019
b207564
Merge pull request #11121 from jstuever/byoh213
sdodson Feb 11, 2019
385e2b2
Merge pull request #11060 from openshift-cherrypick-robot/cherry-pick…
sdodson Feb 11, 2019
e62050e
scaleup: new namespace for machinesets
Feb 8, 2019
7037c5c
Merge pull request #11154 from vrutkovs/devel-40-machineset-namespace
sdodson Feb 12, 2019
6675fc3
Remove vendored ansible-profile callback
mtnbikenc Dec 12, 2018
28fb51c
Merge pull request #11177 from openshift-cherrypick-robot/cherry-pick…
openshift-merge-robot Feb 13, 2019
18b85ab
test/aws: copy criotested cert if it was mounted by CI
Feb 11, 2019
cb27569
Change only pause_image and pause_command in crio config
Feb 13, 2019
8c469f9
Add kubelet and cri-o logs in the output
Feb 13, 2019
ae676d0
MCD port is now 22623
Feb 13, 2019
47b2466
Wait for scaled up machines to become running
Feb 13, 2019
c71b444
Deprecate installer_checkpoint
mtnbikenc Feb 14, 2019
805a141
Clean up lib_utils
mtnbikenc Feb 14, 2019
6b2893c
Setup an ssh bastion in the pod and use it instead of masters
Feb 15, 2019
4a12518
ssh bastion is not stable, add 10 retries
Feb 15, 2019
d4d102e
Don't copy authorized file
Feb 15, 2019
a01cb8a
check_def_equal: user_def should always be a dict
Feb 15, 2019
330d9a2
api host is now api.<clustername>.<basedomain>
Feb 18, 2019
a19f0cd
Construct openshift_bootstrap_endpoint from cluster config CRDs if ku…
Feb 18, 2019
a20829b
Read IdentityFile from openshift_aws_scaleup_key_path var
Feb 18, 2019
168f41f
Merge pull request #11203 from vrutkovs/devel-40-sshbastion
sdodson Feb 20, 2019
992f929
Switch manage-node to cordon
mtnbikenc Feb 20, 2019
54cfbae
Merge pull request #11218 from mtnbikenc/fix-schedulable
openshift-merge-robot Feb 21, 2019
899195f
Use MCO --once-from instead of custom ansible module
Jan 2, 2019
e8da082
Use pull-secret to pull release and MCD images
Feb 21, 2019
ae76702
Fix OpenShiftSDN case
mtnbikenc Feb 21, 2019
ce603ed
Deprecate openshift_sanitize_inventory
mtnbikenc Feb 14, 2019
e52237c
Merge pull request #11230 from mtnbikenc/fix-sdn_case
sdodson Feb 22, 2019
2ec24d8
ssh_bastion: retry until ingress details appear in ssh bastion svc
Feb 25, 2019
6819d5d
Install systemd-journal-gateway
Feb 25, 2019
9afeb2d
Merge pull request #10958 from vrutkovs/devel-40-mco-once
sdodson Feb 25, 2019
38a87e0
Run MCD task asynchronously
mtnbikenc Feb 25, 2019
8d24ee7
Merge pull request #11196 from mtnbikenc/rm-installer-checkpoint
mtnbikenc Feb 25, 2019
9151231
Merge pull request #11236 from vrutkovs/devel-40-ssh-ingress
mtnbikenc Feb 26, 2019
0dff435
Merge pull request #11195 from mtnbikenc/rm-sanitize
mtnbikenc Feb 26, 2019
2af513e
Merge pull request #11197 from mtnbikenc/cleanup-lib_utils
openshift-merge-robot Feb 26, 2019
30fbdeb
Get current release image from cluster version object
Feb 26, 2019
5a9fdee
Add async_status check to manifest apply
mtnbikenc Feb 26, 2019
32941b7
Merge pull request #11245 from vrutkovs/devel-40-mco-release-image
openshift-merge-robot Feb 26, 2019
5f486ae
Update OWNERS file.
patrickdillon Feb 25, 2019
97872b4
Merge pull request #11250 from openshift-cherrypick-robot/cherry-pick…
sdodson Feb 26, 2019
c184770
Require Ansible 2.7.7
mtnbikenc Feb 26, 2019
d31aa2f
Merge pull request #11243 from mtnbikenc/fix-unreachable
openshift-merge-robot Feb 26, 2019
996faea
Add cri-o tasks to openshift_node40 and drop container_runtime role
jstuever Feb 27, 2019
aa458da
Install openshift_node packages using async to avoid issues with bastion
jstuever Feb 28, 2019
242a672
Dockerfile: install ansible 2.7.8
Mar 1, 2019
f3a3148
Add instruction to install libvirt provider
akram Mar 2, 2019
5441162
Merge pull request #11254 from mtnbikenc/update-ansible
sdodson Mar 4, 2019
6b639d7
Merge pull request #11278 from akram/patch-2
sdodson Mar 4, 2019
39916eb
Merge pull request #11261 from jstuever/byoh216
sdodson Mar 4, 2019
34a5fe4
Clean up lib_utils role (Part 2)
mtnbikenc Feb 26, 2019
30abe9f
ssh-bastion: create TCP-based NLB
Mar 5, 2019
4847bbd
Fix version checker, Require 2.7.8
mtnbikenc Mar 5, 2019
f4cf18f
ops-mirror.pem is mandatory for scaleup
Mar 5, 2019
2b0b5d7
Merge pull request #11249 from mtnbikenc/cleanup-lib_utils
openshift-merge-robot Mar 5, 2019
f418843
Merge openshift_facts role into openshift_node40
jstuever Feb 28, 2019
ceb9400
Only use parse_version in compare
mtnbikenc Mar 5, 2019
1b1bdc3
Merge pull request #11290 from vrutkovs/devel-40-sshd_config
openshift-merge-robot Mar 6, 2019
992ed9f
Merge pull request #11299 from jstuever/byoh221
openshift-merge-robot Mar 6, 2019
f2ed434
Replace oc_* module usage with upstream k8s module
mtnbikenc Feb 26, 2019
7cf8b37
Remove lib_openshift role
mtnbikenc Feb 28, 2019
1cf021d
Merge pull request #11298 from mtnbikenc/fix-version-check
sdodson Mar 6, 2019
65c6ab0
Use new machineset labels
mtnbikenc Mar 6, 2019
bf5116f
Use tempfile module in place of command mktemp
mtnbikenc Mar 5, 2019
79bb874
Merge pull request #11295 from mtnbikenc/use-tempfile
openshift-merge-robot Mar 6, 2019
4f303dc
Merge pull request #11316 from mtnbikenc/update-labels
openshift-merge-robot Mar 7, 2019
0410309
Dockerfile: build using RPM packages
Jan 7, 2019
b57953d
openshift-ansible.spec: remove unnecessary deps
Jan 7, 2019
de2ec55
Merge pull request #10960 from vrutkovs/devel-40-dockerfile
openshift-merge-robot Mar 7, 2019
e2e352b
Only use openshift_repos from test playbooks
jstuever Feb 28, 2019
15e630e
No longer worry about openshift_version
jstuever Feb 28, 2019
b3f59cc
Merge init playbooks into openshift_node
jstuever Mar 7, 2019
47db1cd
Move used bits from lib_utils to openshift_node40
jstuever Mar 7, 2019
2027a54
Make tox happy again after dropping lib_utils
jstuever Mar 8, 2019
9bd2d14
Merge pull request #11326 from jstuever/byoh222
openshift-merge-robot Mar 8, 2019
ed0210b
Clean up tests
mtnbikenc Mar 8, 2019
cfddc27
Use openshift-clients package name
mtnbikenc Mar 11, 2019
a7525b6
Update openshift package names
mtnbikenc Mar 11, 2019
0e4f430
Merge pull request #11336 from mtnbikenc/rename-client-package
openshift-merge-robot Mar 11, 2019
eb1f343
Merge pull request #11330 from mtnbikenc/cleanup-tests
openshift-merge-robot Mar 12, 2019
c120c45
Merge of 4.1 development
mtnbikenc Mar 15, 2019
04ecdc0
Run ssh-bastion in privileged mode
Mar 18, 2019
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
20 changes: 0 additions & 20 deletions .coveragerc

This file was deleted.

2 changes: 2 additions & 0 deletions .flake8
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,5 @@
exclude=.tox,inventory
max_line_length = 120
ignore = E501,T003
per-file-ignores =
setup.py : T001
10 changes: 10 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -24,3 +24,13 @@ multi_ec2.yaml
*.egg-info
.eggs
cover/
test/libvirt/install-config.yml
test/libvirt/.openshift_install_state.json
test/libvirt/.openshift_install.log
test/libvirt/*.ign
test/libvirt/install-config-ansible.yml
test/libvirt/terraform/terraform.tfvars
test/libvirt/terraform/.terraform
*.tfstate
*.tfstate.backup
test/libvirt/inventory.txt
5 changes: 1 addition & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ python:

install:
- pip install --upgrade pip
- pip install tox-travis coveralls
- pip install tox-travis

script:
- tox
Expand All @@ -32,6 +32,3 @@ after_failure:
- pip_debug_log=/home/travis/.cache/pip/log/debug.log
- echo Outputting pip debug log from $pip_debug_log
- cat $pip_debug_log

after_success:
- coveralls
144 changes: 77 additions & 67 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,20 +9,18 @@ Master branch is closed! A major refactor is ongoing in devel-40.
Changes for 3.x should be made directly to the latest release branch they're
relevant to and backported from there.

WARNING
=======

This branch is under heavy development. If you are interested in deploying a
working cluster, please utilize a release branch.

# OpenShift Ansible

This repository contains [Ansible](https://www.ansible.com/) roles and
playbooks to install, upgrade, and manage
[OpenShift](https://www.openshift.com/) clusters.

**Note**: the Ansible playbooks in this repository require an RPM
package that provides `docker`. Currently, the RPMs from
[dockerproject.org](https://dockerproject.org/) do not provide this
requirement, though they may in the future. This limitation is being
tracked by
[#2720](https://github.com/openshift/openshift-ansible/issues/2720).

## Getting the correct version
When choosing an openshift release, ensure that the necessary origin packages
are available in your distribution's repository. By default, openshift-ansible
Expand Down Expand Up @@ -69,7 +67,7 @@ Install base dependencies:

Requirements:

- Ansible >= 2.6.5, Ansible 2.7 is not yet supported and known to fail
- Ansible >= 2.7.8
- Jinja >= 2.7
- pyOpenSSL
- python-lxml
Expand All @@ -82,17 +80,6 @@ Fedora:
dnf install -y ansible pyOpenSSL python-cryptography python-lxml
```

Additional requirements:

Logging:

- java-1.8.0-openjdk-headless
- patch

Metrics:

- httpd-tools

## Simple all-in-one localhost Installation
This assumes that you've installed the base dependencies and you're running on
Fedora or RHEL
Expand All @@ -102,62 +89,85 @@ cd openshift-ansible
sudo ansible-playbook -i inventory/hosts.localhost playbooks/prerequisites.yml
sudo ansible-playbook -i inventory/hosts.localhost playbooks/deploy_cluster.yml
```
## Node Group Definition and Mapping
In 3.10 and newer all members of the [nodes] inventory group must be assigned an
`openshift_node_group_name`. This value is used to select the configmap that
configures each node. By default there are three configmaps created; one for
each node group defined in `openshift_node_groups` and they're named
`node-config-master` `node-config-infra` `node-config-compute`. It's important
to note that the configmap is also the authoritative definition of node labels,
the old `openshift_node_labels` value is effectively ignored.

There are also two configmaps that label nodes into multiple roles, these are
not recommended for production clusters, however they're named
`node-config-all-in-one` and `node-config-master-infra` if you'd like to use
them to deploy non production clusters.

The default set of node groups is defined in
[roles/openshift_facts/defaults/main.yml] like so

```
openshift_node_groups:
- name: node-config-master
labels:
- 'node-role.kubernetes.io/master=true'
edits: []
- name: node-config-infra
labels:
- 'node-role.kubernetes.io/infra=true'
edits: []
- name: node-config-compute
labels:
- 'node-role.kubernetes.io/compute=true'
edits: []
- name: node-config-master-infra
labels:
- 'node-role.kubernetes.io/infra=true,node-role.kubernetes.io/master=true'
edits: []
- name: node-config-all-in-one
labels:
- 'node-role.kubernetes.io/infra=true,node-role.kubernetes.io/master=true,node-role.kubernetes.io/compute=true'
edits: []
# Quickstart

Install the new installer from https://www.github.com/openshift/installer

Construct a proper install-config.yml, and make a copy called
install-config-ansible.yml.

## Hosts
You will need the following hosts

### Boostrap host
This is a special host that is not part of the cluster but is required to be
available to help the cluster bootstrap itself. This is not a bastion host,
it will initially be part of the cluster and should be able to communicate with
the masters in the cluster.

### Masters
You need 1 or 3 masters.

### Workers
You need 0 or more workers. Note, by default, masters are unschedulable so
you will need one or more workers if you want to schedule workloads.

## DNS
4.x installs require specific dns records to be in place, and there is no way
to complete an install without working DNS. You are in charge of ensuring the
following DNS records are resolvable from your cluster, the openshift-ansible
installer will not make any attempt to do any of this for you.

First, the output of ```hostname``` on each host must be resolvable to other hosts.
The nodes will communicate with each other based on this value.

install-config.yml value of 'baseDomain' must be a working domain.

### A records
```sh
<clustername>-api.<baseDomain> # ex: mycluster-api.example.com
<clustername>-master-0.<baseDomain> # ex: mycluster-master-0.example.com
<clustername>-etcd-0.<baseDomain> # ex: mycluster-etcd-0.example.com
<clustername>-bootstrap.<baseDomain> # ex: mycluster-bootstrap.example.com
```

When configuring this in the INI based inventory this must be translated into a
Python dictionary. Here's an example of a group named `node-config-all-in-one`
which is suitable for an All-In-One installation with
kubeletArguments.pods-per-core set to 20
Note: There should be a master/etcd record for each master host in your cluster
(either 1 or 3). etcd hosts must be master hosts, and the records must resolve
to the same host for each master/etcd record, respectively.

### SRV records
```sh
SRV _etcd-client-ssl._tcp.<clustername>.<baseDomain> '1 1 2379 <clustername>-etcd-0.<baseDomain>'
SRV _etcd-server-ssl._tcp.<clustername>.<baseDomain> '1 1 2380 <clustername>-etcd-0.<baseDomain>'
...
SRV _etcd-client-ssl._tcp.<clustername>.<baseDomain> '1 1 2379 <clustername>-etcd-<N-1>.<baseDomain>'
SRV _etcd-server-ssl._tcp.<clustername>.<baseDomain> '1 1 2380 <clustername>-etcd-<N-1>.<baseDomain>'

# ex: _etcd-client-ssl._tcp.mycluster.example.com '1 1 2379 mycluster-etcd-0.example.com'
```
openshift_node_groups=[{'name': 'node-config-all-in-one', 'labels': ['node-role.kubernetes.io/master=true', 'node-role.kubernetes.io/infra=true', 'node-role.kubernetes.io/compute=true'], 'edits': [{ 'key': 'kubeletArguments.pods-per-core','value': ['20']}]}]

Consult with your DNS provider about the proper way to create SRV records. In
any case, there should be a client and server SRV record for each etcd backend,
and you MUST use the etcd FQDN you created earlier, not the master or any other
record.

## Inventory
Check out inventory/40_basic_inventory.ini for an example.

## Generate ignition configs
Use the openshift-install command to generate ignition configs utilizing the
install-config.yml you created earlier. This will consume the install-config.yml
file, so ensure you have copied the file as mentioned previously.

```sh
openshift-install create ignition-configs
```

For upgrades, the upgrade process will block until you have the required
configmaps in the openshift-node namespace. Please define
`openshift_node_groups` as explained above or accept the defaults and run the
playbooks/openshift-master/openshift_node_group.yml playbook to have them
created for you automatically.
## Run playbook
playbooks/deploy_cluster_40.yml

# Further reading

## Complete Production Installation Documentation:

Expand Down
6 changes: 0 additions & 6 deletions conftest.py

This file was deleted.

31 changes: 11 additions & 20 deletions images/installer/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,40 +4,31 @@ MAINTAINER OpenShift Team <dev@lists.openshift.redhat.com>

USER root

# Add origin repo for including the oc client
COPY images/installer/origin-extra-root /

# install ansible and deps
RUN INSTALL_PKGS="python-lxml python-dns pyOpenSSL python2-cryptography openssl python2-passlib httpd-tools openssh-clients origin-clients iproute patch" \
&& yum install -y --setopt=tsflags=nodocs $INSTALL_PKGS \
&& EPEL_PKGS="ansible-2.7.4 python2-boto python2-crypto which python2-pip.noarch python2-scandir python2-packaging azure-cli-2.0.46" \
&& yum install -y epel-release \
&& yum install -y --setopt=tsflags=nodocs $EPEL_PKGS \
&& if [ "$(uname -m)" == "x86_64" ]; then yum install -y https://sdodson.fedorapeople.org/google-cloud-sdk-183.0.0-3.el7.x86_64.rpm ; fi \
&& yum install -y java-1.8.0-openjdk-headless \
&& rpm -V $INSTALL_PKGS $EPEL_PKGS $EPEL_TESTING_PKGS \
&& pip install 'apache-libcloud~=2.2.1' 'SecretStorage<3' 'ansible[azure]' 'boto3==1.4.6' \
&& yum clean all

LABEL name="openshift/origin-ansible" \
summary="OpenShift's installation and configuration tool" \
description="A containerized openshift-ansible image to let you run playbooks to install, upgrade, maintain and check an OpenShift cluster" \
description="A containerized openshift-ansible image to use in CI - includes necessary packages to test clusters on AWS/GCP/Azure" \
url="https://github.com/openshift/openshift-ansible" \
io.k8s.display-name="openshift-ansible" \
io.k8s.description="A containerized openshift-ansible image to let you run playbooks to install, upgrade, maintain and check an OpenShift cluster" \
io.k8s.description="A containerized openshift-ansible image to use in CI - includes necessary packages to test clusters on AWS/GCP/Azure" \
io.openshift.expose-services="" \
io.openshift.tags="openshift,install,upgrade,ansible" \
atomic.run="once"

ENV USER_UID=1001 \
HOME=/opt/app-root/src \
HOME=/opt/app-root/src/ \
WORK_DIR=/usr/share/ansible/openshift-ansible \
OPTS="-v"

# Add image scripts and files for running as a system container
COPY images/installer/root /
# Include playbooks, roles, plugins, etc. from this repo
COPY . ${WORK_DIR}
# Add origin repo for including the oc client
COPY images/installer/origin-extra-root /
# Install openshift-ansible RPMs
RUN yum install -y epel-release && \
yum-config-manager --enable built > /dev/null && \
yum install --setopt=tsflags=nodocs -y \
openshift-ansible-test openshift-clients && \
yum clean all

RUN /usr/local/bin/user_setup \
&& rm /usr/local/bin/usage.ocp
Expand Down
41 changes: 0 additions & 41 deletions images/installer/Dockerfile.ci

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@

[centos-ansible26-testing]
name=CentOS Ansible 2.6 testing repo
[centos-ansible27-testing]
name=CentOS Ansible 2.7 testing repo
baseurl=https://cbs.centos.org/repos/configmanagement7-ansible-27-testing/x86_64/os/
enabled=1
gpgcheck=0

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@

[openshift-origin-4.0-ci]
name=OpenShift Origin 4.0 CI packages
baseurl=https://rpms.svc.ci.openshift.org/openshift-origin-v4.0/
enabled=1
gpgcheck=0
Loading