Wolfgang Kulhanek
2020-03-03 80abf5668e29af2945586c269344e8fa16bf3cf2
Fixes for HA Disco Lab (OCP3) (#1225)

5 files deleted
1 files copied
6 files modified
1 files renamed
1528 ■■■■■ changed files
ansible/configs/ocp-ha-disconnected-lab/How.To.Create.Env.Type.adoc 190 ●●●●● patch | view | raw | blame | history
ansible/configs/ocp-ha-disconnected-lab/env_vars.yml 20 ●●●●● patch | view | raw | blame | history
ansible/configs/ocp-ha-disconnected-lab/files/ec2_internal_dns.json.j2 7 ●●●●● patch | view | raw | blame | history
ansible/configs/ocp-ha-disconnected-lab/files/hosts_template.3.11.154.j2 2 ●●● patch | view | raw | blame | history
ansible/configs/ocp-ha-disconnected-lab/files/hosts_template.3.11.161.j2 2 ●●● patch | view | raw | blame | history
ansible/configs/ocp-ha-disconnected-lab/files/hosts_template.3.11.59.j2 395 ●●●●● patch | view | raw | blame | history
ansible/configs/ocp-ha-disconnected-lab/files/labs_hosts_template.3.11.129.j2 403 ●●●●● patch | view | raw | blame | history
ansible/configs/ocp-ha-disconnected-lab/files/labs_hosts_template.3.11.59.j2 402 ●●●●● patch | view | raw | blame | history
ansible/configs/ocp-ha-disconnected-lab/files/repos_template.j2 53 ●●●● patch | view | raw | blame | history
ansible/configs/ocp-ha-disconnected-lab/files/repos_template_3.11.j2 41 ●●●●● patch | view | raw | blame | history
ansible/configs/ocp-ha-disconnected-lab/post_software.yml 6 ●●●●● patch | view | raw | blame | history
ansible/configs/ocp-ha-disconnected-lab/requirements.yml 2 ●●● patch | view | raw | blame | history
ansible/roles/host-httpd-reverse-proxy/tasks/main.yml 5 ●●●●● patch | view | raw | blame | history
ansible/configs/ocp-ha-disconnected-lab/How.To.Create.Env.Type.adoc
File was deleted
ansible/configs/ocp-ha-disconnected-lab/env_vars.yml
@@ -39,7 +39,6 @@
user_vols: 200
user_vols_size: 4Gi
master_api_port: 443
osrelease: 3.11.16
openshift_master_overwrite_named_certificates: true
deploy_openshift: true
deploy_openshift_post: true
@@ -73,6 +72,9 @@
################################################################################
repo_version: '3.11'
osrelease: '3.11.153'
install_ansible_version: 2.8
cloudapps_dns: '*.apps.{{subdomain_base}}.'
master_public_dns: "loadbalancer.{{subdomain_base}}."
@@ -80,7 +82,7 @@
#### Common host variables
################################################################################
update_packages: false
update_packages: true
common_packages:
  - python
  - unzip
@@ -92,18 +94,18 @@
  - vim-enhanced
  - ansible
install_ansible_version: 2.8
rhel_repos:
  - rhel-7-server-rpms
  - rhel-7-server-extras-rpms
  - rhel-7-server-ose-{{repo_version}}-rpms
  - rhel-7-server-ansible-{{ install_ansible_version }}-rpms
- rhel-7-server-rpms
- rhel-7-server-rh-common-rpms
- rhel-7-server-extras-rpms
- rhel-7-server-optional-rpms
- rhel-7-server-ose-{{ repo_version }}-rpms
- rhel-7-server-ansible-{{ install_ansible_version }}-rpms
use_subscription_manager: false
use_own_repos: true
#rhn_pool_id_string: "Red Hat Enterprise Linux Server"
rhn_pool_id_string: OpenShift Container Platform
#rhn_pool_id_string: OpenShift Container Platform
################################################################################
#### nfs host settings
ansible/configs/ocp-ha-disconnected-lab/files/ec2_internal_dns.json.j2
@@ -1,10 +1,6 @@
{
  "Comment": "Create internal dns zone entries",
  "Changes": [
{% for host in groups['masters'] | ] %}
    {
      "Action": "{{DNS_action}}",
@@ -16,7 +12,6 @@
      }
    },
{% endfor %}
{% for host in groups['loadbalancers'] | ] %}
    {
@@ -41,8 +36,6 @@
      }
    },
{% endfor %}
{% for host in groups['nodes'] | ] %}
    {
ansible/configs/ocp-ha-disconnected-lab/files/hosts_template.3.11.154.j2
copy from ansible/configs/ocp-ha-disconnected-lab/files/hosts_template.3.11.129.j2 copy to ansible/configs/ocp-ha-disconnected-lab/files/hosts_template.3.11.154.j2
File was copied from ansible/configs/ocp-ha-disconnected-lab/files/hosts_template.3.11.129.j2
@@ -1,5 +1,5 @@
#
# ansible inventory for OpenShift Container Platform  3.11.129
# ansible inventory for OpenShift Container Platform  3.11.154
# AgnosticD ansible-config: ocp-ha-disconnected-lab
[OSEv3:vars]
ansible/configs/ocp-ha-disconnected-lab/files/hosts_template.3.11.161.j2
File was renamed from ansible/configs/ocp-ha-disconnected-lab/files/hosts_template.3.11.129.j2
@@ -1,5 +1,5 @@
#
# ansible inventory for OpenShift Container Platform  3.11.129
# ansible inventory for OpenShift Container Platform  3.11.161
# AgnosticD ansible-config: ocp-ha-disconnected-lab
[OSEv3:vars]
ansible/configs/ocp-ha-disconnected-lab/files/hosts_template.3.11.59.j2
File was deleted
ansible/configs/ocp-ha-disconnected-lab/files/labs_hosts_template.3.11.129.j2
File was deleted
ansible/configs/ocp-ha-disconnected-lab/files/labs_hosts_template.3.11.59.j2
File was deleted
ansible/configs/ocp-ha-disconnected-lab/files/repos_template.j2
@@ -1,43 +1,18 @@
# RHEL Repos
{% if rhel_repos is defined %}
{% for i in range(0,rhel_repos|length) %}
[{{ rhel_repos[i] }}]
name={{ rhel_repos[i] }}
baseurl=http://{{hostvars[groups['isolated'][0]].internaldns}}{{ own_repo_path | urlsplit('path') }}/{{ rhel_repos[i] }}
enabled=1
gpgcheck=0
{% endfor %}
{% else %}
[rhel-7-server-rpms]
name=Red Hat Enterprise Linux 7
baseurl=http://{{hostvars[groups['isolated'][0]].internaldns}}{{ own_repo_path | urlsplit('path') }}/rhel-7-server-rpms
baseurl=http://{{hostvars[groups['isolated'][0]].internaldns}}{{ own_repo_path | urlsplit('path') }}{{own_repo_path}}/rhel-7-server-rpms
enabled=1
gpgcheck=0
[rhel-7-server-rh-common-rpms]
name=Red Hat Enterprise Linux 7 Common
baseurl=http://{{hostvars[groups['isolated'][0]].internaldns}}{{ own_repo_path | urlsplit('path') }}/rhel-7-server-rh-common-rpms
enabled=1
gpgcheck=0
[rhel-7-server-extras-rpms]
name=Red Hat Enterprise Linux 7 Extras
baseurl=http://{{hostvars[groups['isolated'][0]].internaldns}}{{ own_repo_path | urlsplit('path') }}/rhel-7-server-extras-rpms
enabled=1
gpgcheck=0
[rhel-7-server-optional-rpms]
name=Red Hat Enterprise Linux 7 Optional
baseurl=http://{{hostvars[groups['isolated'][0]].internaldns}}{{ own_repo_path | urlsplit('path') }}/rhel-7-server-optional-rpms
enabled=1
gpgcheck=0
[rhel-7-server-ose-{{repo_version}}-rpms]
name=Red Hat Enterprise Linux 7 OSE {{repo_version}}
baseurl=http://{{hostvars[groups['isolated'][0]].internaldns}}{{ own_repo_path | urlsplit('path') }}/rhel-7-server-ose-{{repo_version}}-rpms
enabled=1
gpgcheck=0
{% if osrelease is version_compare('3.10', '<=') %}
[rhel-7-fast-datapath-rpms]
name=Red Hat Enterprise Linux 7 Fast Datapath
baseurl=http://{{hostvars[groups['isolated'][0]].internaldns}}{{ own_repo_path | urlsplit('path') }}/rhel-7-fast-datapath-rpms
enabled=1
gpgcheck=0
{% endif %}
[rhel-7-server-ansible-{{ install_ansible_version }}-rpms]
name=Red Hat Enterprise Linux Ansible (RPMs)
baseurl=http://{{hostvars[groups['isolated'][0]].internaldns}}{{ own_repo_path | urlsplit('path') }}/rhel-7-server-ansible-{{ install_ansible_version }}-rpms
enabled=1
gpgcheck=0
{% endif %}
ansible/configs/ocp-ha-disconnected-lab/files/repos_template_3.11.j2
File was deleted
ansible/configs/ocp-ha-disconnected-lab/post_software.yml
@@ -60,12 +60,6 @@
      tags:
        - overwrite_hosts_with_lab_hosts
    # sssd bug, fixed by restart
    # - name: restart sssd
    #  service:
      #    name: sssd
      #  state: restarted
      #   when: install_ipa_client
    ## Create PVs for uservols if required
    - name: get nfs Hostname
      set_fact:
ansible/configs/ocp-ha-disconnected-lab/requirements.yml
@@ -3,4 +3,4 @@
- src: https://github.com/redhat-gpte-devopsautomation/ftl-injector
  name: ftl-injector
  version: v0.16.0
  version: v0.17.0
ansible/roles/host-httpd-reverse-proxy/tasks/main.yml
@@ -1,11 +1,10 @@
- name: install httpd package
  yum:
    name: "{{ item }}"
    state: present
  with_items:
    name:
    - httpd
  tags:
    - install_httpd_packages
  - install_httpd_packages
- name: create reverse proxy file on httpd /etc/httpd/conf.d
  template: