For working with OKD

Author: literalice

README.md

@@ -46,7 +46,8 @@ You will be asked some parameters for configuring the cluster infrastructure. Se
 
 ### Public DNS setting
 
-You need to set up the domain names for install and access the cluster.
+If you want to use your named domain, you need to set up the domain names for install and access the cluster.
+If not, xx.xx.xx.xx.nip.io address is used.
 
 `make dns-nameservers`
 
@@ -118,6 +119,7 @@ export TF_VAR_rhn_password="xxxxxxxxxxx"
 export TF_VAR_rh_subscription_pool_id="xxxxxxxx"
 
 # Public DNS subdomain for access to services served in the cluster
+# If it isn't set, a nip address is used.
 export TF_VAR_platform_domain=sample-platform.example.com
 # Email used to register Let's encrypt account.
 export TF_VAR_platform_domain_administrator_email=administrator@example.com

examples/origin/variables.tf

@@ -38,7 +38,7 @@ variable "compute_node_count" {
   default = 2
 }
 
-variable "compute_instance_type" {
+variable "compute_node_instance_type" {
   default = "m4.large"
 }
 

modules/infrastructure/resources/origin-bastion-init.yml

@@ -6,16 +6,15 @@ write_files:
     path: /root/platform_id_rsa
     permissions: '0600'
 runcmd:
+ - yum -y install git vim httpd-tools java-1.8.0-openjdk-headless python-passlib patch
+ - yum -y update
  - yum -y install https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm
  - sed -i -e "s/^enabled=1/enabled=0/" /etc/yum.repos.d/epel.repo
- - yum -y install wget git net-tools bind-utils iptables-services bridge-utils bash-completion kexec-tools sos psacct
- - yum -y --enablerepo=epel install ansible pyOpenSSL vim
- - rpm -Uvh https://releases.ansible.com/ansible/rpm/release/epel-7-x86_64/ansible-2.4.3.0-1.el7.ans.noarch.rpm
- - yum update
+ - yum -y --enablerepo=epel install ansible pyOpenSSL
  - git clone https://github.com/openshift/openshift-ansible
  - mkdir -p /usr/share/ansible/
  - mv openshift-ansible /usr/share/ansible/
- - cd /usr/share/ansible/openshift-ansible && git checkout -b release-${openshift_major_version} origin/release-${openshift_major_version}
+ - cd /usr/share/ansible/openshift-ansible && git checkout release-${openshift_major_version}
  - curl -L -o /usr/local/bin/ocinventory https://github.com/literalice/openshift-inventory-utils/releases/download/v0.1/ocinventory_unix
  - chmod +x /usr/local/bin/ocinventory
  - chown ${bastion_ssh_user}:${bastion_ssh_user} /root/platform_id_rsa

resources/openshift-install.sh

@@ -22,6 +22,10 @@ if [ -z $UPSTREAM ]; then
     ansible all -i $HOME/inventory.yml -a 'subscription-manager repos --disable="*"'
     ansible all -i $HOME/inventory.yml -a 'subscription-manager repos --enable="rhel-7-server-rpms" --enable="rhel-7-server-extras-rpms" --enable="rhel-7-fast-datapath-rpms" --enable="rhel-7-server-ansible-2.4-rpms"'
     ansible all -i $HOME/inventory.yml -a 'subscription-manager repos --enable="rhel-7-server-ose-${openshift_major_version}-rpms"'
+else
+    ansible all -i $HOME/inventory.yml -m yum -a 'name=wget,git,net-tools,bind-utils,yum-utils,iptables-services,bridge-utils,bash-completion,kexec-tools,sos,psacct,atomic state=present'
+    ansible all -i $HOME/inventory.yml -m yum -a 'name=docker-1.13.1 state=present'
+    ansible all -i $HOME/inventory.yml -m systemd -a 'name=docker state=started enabled=yes'
 fi
 
 ansible-playbook -i $HOME/inventory.yml /usr/share/ansible/openshift-ansible/playbooks/prerequisites.yml -vvv | tee ansible-$(date +%Y%m%d%H%M%S)-prerequisites.log