13 files changed, 143 insertions, 156 deletions
diff --git a/playbooks/aws/openshift-cluster/accept.yml b/playbooks/aws/openshift-cluster/accept.yml
index ffc367f9f..c2c8bea50 100755
--- a/playbooks/aws/openshift-cluster/accept.yml
+++ b/playbooks/aws/openshift-cluster/accept.yml
@@ -42,12 +42,12 @@
     until: "'instances' in instancesout and instancesout.instances|length > 0"
 
   - debug:
-      msg: "{{ instancesout.instances|map(attribute='private_dns_name') | list | regex_replace('.ec2.internal') }}"
+      msg: "{{ instancesout.instances|map(attribute='private_dns_name') | list }}"
 
   - name: approve nodes
     oc_adm_csr:
       #approve_all: True
-      nodes: "{{ instancesout.instances|map(attribute='private_dns_name') | list | regex_replace('.ec2.internal') }}"
-      timeout: 0
+      nodes: "{{ instancesout.instances|map(attribute='private_dns_name') | list  }}"
+      timeout: 60
     register: nodeout
     delegate_to: "{{ mastersout.instances[0].public_ip_address }}"
diff --git a/playbooks/aws/openshift-cluster/build_ami.yml b/playbooks/aws/openshift-cluster/build_ami.yml
index 1e54f0467..fae30eb0a 100644
--- a/playbooks/aws/openshift-cluster/build_ami.yml
+++ b/playbooks/aws/openshift-cluster/build_ami.yml
@@ -17,71 +17,24 @@
     - name: openshift_aws_region
       msg: "openshift_aws_region={{ openshift_aws_region | default('us-east-1') }}"
 
-  - name: create an instance and prepare for ami
-    include_role:
-      name: openshift_aws
-      tasks_from: build_ami.yml
-    vars:
-      openshift_aws_node_group_type: compute
-
-  - name: fetch newly created instances
-    ec2_remote_facts:
-      region: "{{ openshift_aws_region | default('us-east-1') }}"
-      filters:
-        "tag:Name": "{{ openshift_aws_base_ami_name | default('ami_base') }}"
-        instance-state-name: running
-    register: instancesout
-    retries: 20
-    delay: 3
-    until: instancesout.instances|length > 0
-
-  - name: wait for ssh to become available
-    wait_for:
-      port: 22
-      host: "{{ instancesout.instances[0].public_ip_address }}"
-      timeout: 300
-      search_regex: OpenSSH
-
-  - name: add host to nodes
-    add_host:
-      groups: nodes
-      name: "{{ instancesout.instances[0].public_dns_name }}"
+- include: provision_instance.yml
+  vars:
+    openshift_aws_node_group_type: compute
 
 - hosts: nodes
   gather_facts: False
   tasks:
   - name: set the user to perform installation
     set_fact:
-      ansible_ssh_user: "{{ openshift_aws_build_ami_ssh_user | default('root') }}"
-
-- name: normalize groups
-  include: ../../byo/openshift-cluster/initialize_groups.yml
-
-- name: run the std_include
-  include: ../../common/openshift-cluster/evaluate_groups.yml
-
-- name: run the std_include
-  include: ../../common/openshift-cluster/initialize_facts.yml
-
-- name: run the std_include
-  include: ../../common/openshift-cluster/initialize_openshift_repos.yml
-
-- name: run node config setup
-  include: ../../common/openshift-node/setup.yml
-
-- name: run node config
-  include: ../../common/openshift-node/configure_nodes.yml
-
-- name: Re-enable excluders
-  include: ../../common/openshift-node/enable_excluders.yml
-
-- hosts: localhost
-  connection: local
-  become: no
-  tasks:
-  - name: seal the ami
-    include_role:
-      name: openshift_aws
-      tasks_from: seal_ami.yml
-    vars:
-      openshift_aws_ami_name: "openshift-gi-{{ lookup('pipe', 'date +%Y%m%d%H%M')}}"
+      ansible_ssh_user: "{{ openshift_aws_build_ami_ssh_user | default(ansible_ssh_user) }}"
+      openshift_node_bootstrap: True
+      openshift_node_image_prep_packages:
+      - cloud-utils-growpart
+
+# This is the part that installs all of the software and configs for the instance
+# to become a node.
+- include: ../../common/openshift-node/image_prep.yml
+
+- include: seal_ami.yml
+  vars:
+    openshift_aws_ami_name: "openshift-gi-{{ lookup('pipe', 'date +%Y%m%d%H%M')}}"
diff --git a/playbooks/aws/openshift-cluster/hosted.yml b/playbooks/aws/openshift-cluster/hosted.yml
new file mode 100644
index 000000000..db6e3b8e1
--- /dev/null
+++ b/playbooks/aws/openshift-cluster/hosted.yml
@@ -0,0 +1,22 @@
+---
+- include: ../../common/openshift-cluster/openshift_hosted.yml
+
+- include: ../../common/openshift-cluster/openshift_metrics.yml
+  when: openshift_metrics_install_metrics | default(false) | bool
+
+- include: ../../common/openshift-cluster/openshift_logging.yml
+  when: openshift_logging_install_logging | default(false) | bool
+
+- include: ../../common/openshift-cluster/service_catalog.yml
+  when: openshift_enable_service_catalog | default(false) | bool
+
+- include: ../../common/openshift-management/config.yml
+  when: openshift_management_install_management | default(false) | bool
+
+- name: Print deprecated variable warning message if necessary
+  hosts: oo_first_master
+  gather_facts: no
+  tasks:
+  - debug: msg="{{__deprecation_message}}"
+    when:
+    - __deprecation_message | default ('') | length > 0
diff --git a/playbooks/aws/openshift-cluster/install.yml b/playbooks/aws/openshift-cluster/install.yml
index 86d58a68e..874d2d38a 100644
--- a/playbooks/aws/openshift-cluster/install.yml
+++ b/playbooks/aws/openshift-cluster/install.yml
@@ -1,74 +1,46 @@
 ---
-- name: Setup the vpc and the master node group
+- name: Setup the master node group
   hosts: localhost
   tasks:
-  - name: Alert user to variables needed - clusterid
-    debug:
-      msg: "openshift_aws_clusterid={{ openshift_aws_clusterid | default('default') }}"
-
-  - name: Alert user to variables needed - region
-    debug:
-      msg: "openshift_aws_region={{ openshift_aws_region | default('us-east-1') }}"
-
-  - name: fetch newly created instances
-    ec2_remote_facts:
-      region: "{{ openshift_aws_region | default('us-east-1') }}"
-      filters:
-        "tag:clusterid": "{{ openshift_aws_clusterid | default('default') }}"
-        "tag:host-type": master
-        instance-state-name: running
-    register: instancesout
-    retries: 20
-    delay: 3
-    until: instancesout.instances|length > 0
-
-  - name: add new master to masters group
-    add_host:
-      groups: "masters,etcd,nodes"
-      name: "{{ item.public_ip_address }}"
-      hostname: "{{ openshift_aws_clusterid | default('default') }}-master-{{ item.id[:-5] }}"
-    with_items: "{{ instancesout.instances }}"
-
-  - name: wait for ssh to become available
-    wait_for:
-      port: 22
-      host: "{{ item.public_ip_address }}"
-      timeout: 300
-      search_regex: OpenSSH
-    with_items: "{{ instancesout.instances }}"
+  - include_role:
+      name: openshift_aws
+      tasks_from: setup_master_group.yml
 
 - name: set the master facts for hostname to elb
   hosts: masters
   gather_facts: no
   remote_user: root
   tasks:
-  - name: fetch elbs
-    ec2_elb_facts:
-      region: "{{ openshift_aws_region | default('us-east-1') }}"
-      names:
-      - "{{ item }}"
-    with_items:
-    - "{{ openshift_aws_clusterid | default('default') }}-master-external"
-    - "{{ openshift_aws_clusterid | default('default') }}-master-internal"
-    delegate_to: localhost
-    register: elbs
+  - include_role:
+      name: openshift_aws
+      tasks_from: master_facts.yml
+
+- name: run the init
+  include: ../../init/main.yml
+
+- name: perform the installer openshift-checks
+  include: ../../openshift-checks/private/install.yml
+
+- name: etcd install
+  include: ../../common/openshift-etcd/config.yml
+
+- name: include nfs
+  include: ../../common/openshift-nfs/config.yml
+  when: groups.oo_nfs_to_config | default([]) | count > 0
 
-  - debug: var=elbs
+- name: include loadbalancer
+  include: ../../common/openshift-loadbalancer/config.yml
+  when: groups.oo_lb_to_config | default([]) | count > 0
 
-  - name: set fact
-    set_fact:
-      openshift_master_cluster_hostname: "{{ elbs.results[1].elbs[0].dns_name }}"
-      osm_custom_cors_origins:
-      - "{{ elbs.results[1].elbs[0].dns_name }}"
-      - "console.{{ openshift_aws_clusterid | default('default') }}.openshift.com"
-      - "api.{{ openshift_aws_clusterid | default('default') }}.openshift.com"
-    with_items: "{{ groups['masters'] }}"
+- name: include openshift-master config
+  include: ../../common/openshift-master/config.yml
 
-- name: normalize groups
-  include: ../../byo/openshift-cluster/initialize_groups.yml
+- name: include master additional config
+  include: ../../common/openshift-master/additional_config.yml
 
-- name: run the std_include
-  include: ../../common/openshift-cluster/std_include.yml
+- name: include master additional config
+  include: ../../common/openshift-node/config.yml
 
-- name: run the config
-  include: ../../common/openshift-cluster/config.yml
+- name: include openshift-glusterfs
+  include: ../../common/openshift-glusterfs/config.yml
+  when: groups.oo_glusterfs_to_config | default([]) | count > 0
diff --git a/playbooks/aws/openshift-cluster/prerequisites.yml b/playbooks/aws/openshift-cluster/prerequisites.yml
new file mode 100644
index 000000000..f5eb01b14
--- /dev/null
+++ b/playbooks/aws/openshift-cluster/prerequisites.yml
@@ -0,0 +1,6 @@
+---
+- include: provision_vpc.yml
+
+- include: provision_ssh_keypair.yml
+
+- include: provision_sec_group.yml
diff --git a/playbooks/aws/openshift-cluster/provision.yml b/playbooks/aws/openshift-cluster/provision.yml
index 8f018abd0..4b5bd22ea 100644
--- a/playbooks/aws/openshift-cluster/provision.yml
+++ b/playbooks/aws/openshift-cluster/provision.yml
@@ -1,5 +1,5 @@
 ---
-- name: Setup the vpc and the master node group
+- name: Setup the elb and the master node group
   hosts: localhost
   tasks:
 
diff --git a/playbooks/aws/openshift-cluster/provision_install.yml b/playbooks/aws/openshift-cluster/provision_install.yml
index e787deced..78dd6a49b 100644
--- a/playbooks/aws/openshift-cluster/provision_install.yml
+++ b/playbooks/aws/openshift-cluster/provision_install.yml
@@ -6,11 +6,14 @@
 - name: Include the provision.yml playbook to create cluster
   include: provision.yml
 
-- name: Include the install.yml playbook to install cluster
+- name: Include the install.yml playbook to install cluster on masters
   include: install.yml
 
-- name: Include the install.yml playbook to install cluster
+- name: provision the infra/compute playbook to install node resources
   include: provision_nodes.yml
 
 - name: Include the accept.yml playbook to accept nodes into the cluster
   include: accept.yml
+
+- name: Include the hosted.yml playbook to finish the hosted configuration
+  include: hosted.yml
diff --git a/playbooks/aws/openshift-cluster/provision_instance.yml b/playbooks/aws/openshift-cluster/provision_instance.yml
new file mode 100644
index 000000000..6e843453c
--- /dev/null
+++ b/playbooks/aws/openshift-cluster/provision_instance.yml
@@ -0,0 +1,12 @@
+---
+# If running this play directly, be sure the variable
+# 'openshift_aws_node_group_type' is set correctly for your usage.
+# See build_ami.yml for an example.
+- hosts: localhost
+  connection: local
+  gather_facts: no
+  tasks:
+  - name: create an instance and prepare for ami
+    include_role:
+      name: openshift_aws
+      tasks_from: provision_instance.yml
diff --git a/playbooks/aws/openshift-cluster/provision_sec_group.yml b/playbooks/aws/openshift-cluster/provision_sec_group.yml
new file mode 100644
index 000000000..7d74a691a
--- /dev/null
+++ b/playbooks/aws/openshift-cluster/provision_sec_group.yml
@@ -0,0 +1,13 @@
+---
+# If running this play directly, be sure the variable
+# 'openshift_aws_node_group_type' is set correctly for your usage.
+# See build_ami.yml for an example.
+- hosts: localhost
+  connection: local
+  gather_facts: no
+  tasks:
+  - name: create security groups
+    include_role:
+      name: openshift_aws
+      tasks_from: security_group.yml
+    when: openshift_aws_create_security_groups | default(True) | bool
diff --git a/playbooks/aws/openshift-cluster/provision_ssh_keypair.yml b/playbooks/aws/openshift-cluster/provision_ssh_keypair.yml
new file mode 100644
index 000000000..3ec683958
--- /dev/null
+++ b/playbooks/aws/openshift-cluster/provision_ssh_keypair.yml
@@ -0,0 +1,12 @@
+---
+- hosts: localhost
+  connection: local
+  gather_facts: no
+  tasks:
+  - name: create an instance and prepare for ami
+    include_role:
+      name: openshift_aws
+      tasks_from: ssh_keys.yml
+    vars:
+      openshift_aws_node_group_type: compute
+    when: openshift_aws_users | default([]) | length  > 0
diff --git a/playbooks/aws/openshift-cluster/provision_vpc.yml b/playbooks/aws/openshift-cluster/provision_vpc.yml
new file mode 100644
index 000000000..0a23a6d32
--- /dev/null
+++ b/playbooks/aws/openshift-cluster/provision_vpc.yml
@@ -0,0 +1,10 @@
+---
+- hosts: localhost
+  connection: local
+  gather_facts: no
+  tasks:
+  - name: create a vpc
+    include_role:
+      name: openshift_aws
+      tasks_from: vpc.yml
+    when: openshift_aws_create_vpc | default(True) | bool
diff --git a/playbooks/aws/openshift-cluster/provisioning_vars.example.yml b/playbooks/aws/openshift-cluster/provisioning_vars.example.yml
deleted file mode 100644
index 28eb9c993..000000000
--- a/playbooks/aws/openshift-cluster/provisioning_vars.example.yml
+++ /dev/null
@@ -1,28 +0,0 @@
----
-# when creating an AMI set this option to True
-# when installing the cluster, set this to False
-openshift_node_bootstrap: True
-
-# specify a clusterid
-#openshift_aws_clusterid: default
-
-# must specify a base_ami when building an AMI
-#openshift_aws_base_ami:
-
-# when creating an encrypted AMI please specify use_encryption
-#openshift_aws_ami_encrypt: False
-
-# custom certificates are required for the ELB
-#openshift_aws_iam_cert_path: '/path/to/wildcard.<clusterid>.example.com.crt'
-#openshift_aws_iam_key_path: '/path/to/wildcard.<clusterid>.example.com.key'
-#openshift_aws_iam_cert_chain_path: '/path/to/cert.ca.crt'
-
-# This is required for any ec2 instances
-#openshift_aws_ssh_key_name: myuser_key
-
-# This will ensure these users are created
-#openshift_aws_users:
-#- key_name: myuser_key
-#  username: myuser
-#  pub_key: |
-#         ssh-rsa AAAA
diff --git a/playbooks/aws/openshift-cluster/seal_ami.yml b/playbooks/aws/openshift-cluster/seal_ami.yml
new file mode 100644
index 000000000..8239a64fb
--- /dev/null
+++ b/playbooks/aws/openshift-cluster/seal_ami.yml
@@ -0,0 +1,12 @@
+---
+# If running this play directly, be sure the variable
+# 'openshift_aws_ami_name' is set correctly for your usage.
+# See build_ami.yml for an example.
+- hosts: localhost
+  connection: local
+  become: no
+  tasks:
+  - name: seal the ami
+    include_role:
+      name: openshift_aws
+      tasks_from: seal_ami.yml