openshift · rsevilla87 · Oct 3, 2018 · Oct 3, 2018 · Oct 4, 2018 · Oct 4, 2018
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
@@ -0,0 +1,6 @@
+NOTICE
+======
+
+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.
diff --git a/.pylintrc b/.pylintrc
@@ -215,7 +215,7 @@ ignore-mixin-members=yes
 # and thus existing member attributes cannot be deduced by static analysis. It
 # supports qualified module names, as well as Unix pattern matching.
 # Ignoring ansible.constants to suppress `no-member` warnings
-ignored-modules=ansible.constants
+ignored-modules=ansible.constants,distutils
 
 # List of classes names for which member attributes should not be checked
 # (useful for classes with attributes dynamically set). This supports can work

diff --git a/.tito/packages/openshift-ansible b/.tito/packages/openshift-ansible
@@ -1 +1 @@
-3.11.0-0.28.0 ./
+4.0.0-0.94.0 ./
diff --git a/.tito/releasers.conf b/.tito/releasers.conf
@@ -62,6 +62,11 @@ releaser = tito.release.DistGitReleaser
 branches = rhaos-3.11-rhel-7
 srpm_disttag = .el7aos
 
+[aos-4.0]
+releaser = tito.release.DistGitReleaser
+branches = rhaos-4.0-rhel-7
+srpm_disttag = .el7aos
+
 [copr-openshift-ansible]
 releaser = tito.release.CoprReleaser
 project_name = @OpenShiftOnlineOps/openshift-ansible
diff --git a/README.md b/README.md
@@ -2,6 +2,14 @@
 [![Build Status](https://travis-ci.org/openshift/openshift-ansible.svg?branch=master)](https://travis-ci.org/openshift/openshift-ansible)
 [![Coverage Status](https://coveralls.io/repos/github/openshift/openshift-ansible/badge.svg?branch=master)](https://coveralls.io/github/openshift/openshift-ansible?branch=master)
 
+NOTICE
+======
+
+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.
+
+
 # OpenShift Ansible
 
 This repository contains [Ansible](https://www.ansible.com/) roles and
@@ -61,7 +69,7 @@ Install base dependencies:
 
 Requirements:
 
-- Ansible >= 2.6.2
+- Ansible >= 2.6.5, Ansible 2.7 is not yet supported and known to fail
 - Jinja >= 2.7
 - pyOpenSSL
 - python-lxml
@@ -153,7 +161,7 @@ created for you automatically.
 
 ## Complete Production Installation Documentation:
 
-- [OpenShift Container Platform](https://docs.openshift.com/container-platform/latest/install_config/install/advanced_install.html)
+- [OpenShift Container Platform](https://docs.openshift.com/container-platform/3.11/install/running_install.html)
 - [OpenShift Origin](https://docs.okd.io/latest/install/index.html)
 
 ## Containerized OpenShift Ansible

diff --git a/README_CONTAINERIZED_INSTALLATION.md b/README_CONTAINERIZED_INSTALLATION.md
diff --git a/examples/certificate-check-upload.yaml b/examples/certificate-check-upload.yaml
@@ -10,7 +10,7 @@
 # The following objects are expected to be configured before the creation
 # of this Job:
 #   - A ConfigMap named 'inventory' with a key named 'hosts' that
-#     contains the the Ansible inventory file
+#     contains the Ansible inventory file
 #   - A Secret named 'sshkey' with a key named 'ssh-privatekey
 #     that contains the ssh key to connect to the hosts
 # (see examples/README.md for more details)

diff --git a/examples/certificate-check-volume.yaml b/examples/certificate-check-volume.yaml
@@ -10,7 +10,7 @@
 # The following objects are expected to be configured before the creation
 # of this Job:
 #   - A ConfigMap named 'inventory' with a key named 'hosts' that
-#     contains the the Ansible inventory file
+#     contains the Ansible inventory file
 #   - A Secret named 'sshkey' with a key named 'ssh-privatekey
 #     that contains the ssh key to connect to the hosts
 #   - A PersistentVolumeClaim named 'certcheck-reports' where the

diff --git a/hack/ci-build-rpm.sh b/hack/ci-build-rpm.sh
@@ -0,0 +1,9 @@
+#!/bin/bash
+
+# This script builds RPMs for Prow CI
+tito tag --offline --accept-auto-changelog --use-release '9999%{?dist}'
+tito build --output="_output/local/releases" --rpm --test --offline --quiet
+
+mkdir _output/local/releases/rpms
+mv _output/local/releases/noarch/* _output/local/releases/rpms
+createrepo _output/local/releases/rpms
diff --git a/hack/ci-build-unittests.sh b/hack/ci-build-unittests.sh
@@ -0,0 +1,6 @@
+#!/bin/bash
+
+# This script installs tox dependencies in the test container
+yum install -y gcc libffi-devel python-devel openssl-devel python-pip
+pip install tox
+chmod uga+w /etc/passwd
diff --git a/hack/ci-run-unittests.sh b/hack/ci-run-unittests.sh
@@ -0,0 +1,5 @@
+#!/bin/bash
+
+# This script runs tox tests in test container
+echo "${USER:-default}:x:$(id -u):$(id -g):Default User:${HOME:-/tmp}:/sbin/nologin" >> /etc/passwd
+tox 2>&1 | tee /tmp/artifacts/output.log
diff --git a/images/installer/Dockerfile b/images/installer/Dockerfile
@@ -10,11 +10,9 @@ 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="python2-boto python2-boto3 python2-crypto which python2-pip.noarch python2-scandir python2-packaging azure-cli" \
- && EPEL_TESTING_PKGS="ansible" \
+ && EPEL_PKGS="ansible-2.6.5 python2-boto python2-boto3 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 \
- && yum install -y --setopt=tsflags=nodocs --enablerepo=epel-testing $EPEL_TESTING_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 \

diff --git a/images/installer/Dockerfile.ci b/images/installer/Dockerfile.ci
@@ -0,0 +1,41 @@
+FROM centos:7
+
+MAINTAINER OpenShift Team <dev@lists.openshift.redhat.com>
+
+USER root
+
+LABEL name="openshift/origin-ansible" \
+      summary="OpenShift's installation and configuration tool" \
+      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 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 \
+    WORK_DIR=/usr/share/ansible/openshift-ansible \
+    OPTS="-v"
+
+# Add image scripts and files for running as a system container
+COPY images/installer/root /
+# Add origin repo for including the oc client
+COPY images/installer/origin-extra-root /
+# Install openshift-ansible RPMs
+RUN yum install -y epel-release && \
+    rm -rf /etc/yum.repos.d/centos-openshift-origin.repo && \
+    yum-config-manager --enable built > /dev/null && \
+    INSTALL_PKGS="openssh google-cloud-sdk azure-cli-2.0.46" \
+    yum install --setopt=tsflags=nodocs -y $INSTALL_PKGS openshift-ansible-test && \
+    yum clean all
+
+RUN /usr/local/bin/user_setup \
+ && rm /usr/local/bin/usage.ocp
+
+USER ${USER_UID}
+
+WORKDIR ${WORK_DIR}
+ENTRYPOINT [ "/usr/local/bin/entrypoint" ]
+CMD [ "/usr/local/bin/run" ]
diff --git a/images/installer/container.yaml b/images/installer/container.yaml
@@ -0,0 +1,13 @@
+---
+compose:
+  packages:
+  - openshift-ansible
+  - python2-crypto
+  - httpd-tools
+  - google-cloud-sdk
+  - java-1.8.0-openjdk-headless
+  - atomic-openshift-clients
+  - openssl
+  - iproute
+  - python-boto
+  - python2-boto3
diff --git a/images/installer/origin-extra-root/etc/yum.repos.d/centos-ansible26.repo b/images/installer/origin-extra-root/etc/yum.repos.d/centos-ansible26.repo
@@ -0,0 +1,6 @@
+
+[centos-ansible26-testing]
+name=CentOS Ansible 2.6 testing repo
+baseurl=https://cbs.centos.org/repos/configmanagement7-ansible-26-testing/x86_64/os/
+enabled=1
+gpgcheck=0
diff --git a/images/installer/root/usr/local/bin/generate b/images/installer/root/usr/local/bin/generate
@@ -186,7 +186,7 @@ class Host:
         if self.public_ip_addr:
             info += "openshift_public_ip=" + self.public_ip_addr + " "
         if self.hostname:
-            info += "openshift_hostname=" + self.hostname + " "
+            info += "openshift_kubelet_name_override=" + self.hostname + " "
         if self.public_hostname:
             info += "openshift_public_hostname=" + self.public_hostname
 

diff --git a/inventory/hosts.example b/inventory/hosts.example
@@ -188,8 +188,6 @@ debug_level=2
 #oreg_auth_password='my-pass'
 # NOTE: oreg_url must be defined by the user for oreg_auth_* to have any affect.
 # oreg_auth_pass should be generated from running docker login.
-# To update registry auth credentials, uncomment the following:
-#oreg_auth_credentials_replace: True
 
 # OpenShift repository configuration
 #openshift_additional_repos=[{'id': 'openshift-origin-copr', 'name': 'OpenShift Origin COPR', 'baseurl': 'https://copr-be.cloud.fedoraproject.org/results/maxamillion/origin-next/epel-7-$basearch/', 'enabled': 1, 'gpgcheck': 1, 'gpgkey': 'https://copr-be.cloud.fedoraproject.org/results/maxamillion/origin-next/pubkey.gpg'}]
@@ -251,6 +249,20 @@ debug_level=2
 # or
 #openshift_master_request_header_ca_file=<path to local ca file to use>
 
+# GitHub auth
+#openshift_master_identity_providers=[{"name": "github", "login": "true", "challenge": "false", "kind": "GitHubIdentityProvider", "mappingMethod": "claim", "client_id": "my_client_id", "client_secret": "my_client_secret", "teams": ["team1", "team2"], "hostname": "githubenterprise.example.com", "ca": "" }]
+#
+# Configure github CA certificate
+# Specify either the ASCII contents of the certificate or the path to
+# the local file that will be copied to the remote host. CA
+# certificate contents will be copied to master systems and saved
+# within /etc/origin/master/ with a filename matching the "ca" key set
+# within the GitHubIdentityProvider.
+#
+#openshift_master_github_ca=<ca text>
+# or
+#openshift_master_github_ca_file=<path to local ca file to use>
+
 # CloudForms Management Engine (ManageIQ) App Install
 #
 # Enables installation of MIQ server. Recommended for dedicated
@@ -701,25 +713,6 @@ debug_level=2
 # this value must be 1
 #openshift_logging_es_cluster_size=1
 
-# Prometheus deployment
-#
-# Currently prometheus deployment is disabled by default, enable it by setting this
-#openshift_hosted_prometheus_deploy=true
-#
-# Prometheus storage config
-# By default prometheus uses emptydir storage, if you want to persist you should
-# configure it to use pvc storage type. Each volume must be ReadWriteOnce.
-#openshift_prometheus_storage_type=emptydir
-#openshift_prometheus_alertmanager_storage_type=emptydir
-#openshift_prometheus_alertbuffer_storage_type=emptydir
-# Use PVCs for persistence
-#openshift_prometheus_storage_type=pvc
-#openshift_prometheus_alertmanager_storage_type=pvc
-#openshift_prometheus_alertbuffer_storage_type=pvc
-
-# Grafana deployment, requires Prometheus
-#openshift_hosted_grafana_deploy=true
-
 # Configure the multi-tenant SDN plugin (default is 'redhat/openshift-ovs-subnet')
 # os_sdn_network_plugin_name='redhat/openshift-ovs-multitenant'
 
@@ -846,7 +839,7 @@ debug_level=2
 #logrotate_scripts=[{"name": "syslog", "path": "/var/log/cron\n/var/log/maillog\n/var/log/messages\n/var/log/secure\n/var/log/spooler\n", "options": ["daily", "rotate 7", "compress", "sharedscripts", "missingok"], "scripts": {"postrotate": "/bin/kill -HUP `cat /var/run/syslogd.pid 2> /dev/null` 2> /dev/null || true"}}]
 
 # The OpenShift-Ansible installer will fail when it detects that the
-# value of openshift_hostname resolves to an IP address not bound to any local
+# value of openshift_kubelet_name_override resolves to an IP address not bound to any local
 # interfaces. This mis-configuration is problematic for any pod leveraging host
 # networking and liveness or readiness probes.
 # Setting this variable to false will override that check.
@@ -1056,7 +1049,7 @@ debug_level=2
 #
 # LOCAL NFS NOTE:
 #
-# You may may also change this value if you want to change the default
+# You may also change this value if you want to change the default
 # path used for local NFS exports.
 #openshift_management_storage_nfs_base_dir: /exports
 

diff --git a/inventory/hosts.openstack b/inventory/hosts.openstack
@@ -24,7 +24,7 @@ openshift_master_identity_providers=[{'name': 'htpasswd_auth', 'login': 'true',
 #openshift_pkg_version=-3.0.0.0
 
 [masters]
-jdetiber-master.usersys.redhat.com openshift_public_hostname="{{ inventory_hostname }}" openshift_hostname="{{ ansible_default_ipv4.address }}"
+jdetiber-master.usersys.redhat.com openshift_public_hostname="{{ inventory_hostname }}"
 
 [etcd]
 jdetiber-etcd.usersys.redhat.com
@@ -33,5 +33,5 @@ jdetiber-etcd.usersys.redhat.com
 #ose3-lb-ansible.test.example.com
 
 [nodes]
-jdetiber-master.usersys.redhat.com openshift_public_hostname="{{ inventory_hostname }}" openshift_hostname="{{ ansible_default_ipv4.address }}" openshift_node_group_name="node-config-master"
-jdetiber-node[1:2].usersys.redhat.com openshift_public_hostname="{{ inventory_hostname }}" openshift_hostname="{{ ansible_default_ipv4.address }}" openshift_node_group_name="node-config-compute"
+jdetiber-master.usersys.redhat.com openshift_public_hostname="{{ inventory_hostname }}" openshift_node_group_name="node-config-master"
+jdetiber-node[1:2].usersys.redhat.com openshift_public_hostname="{{ inventory_hostname }}" openshift_node_group_name="node-config-compute"