11 files changed, 75 insertions, 29 deletions
diff --git a/playbooks/aws/README.md b/playbooks/aws/README.md
index 417fb539a..d203b9cda 100644
--- a/playbooks/aws/README.md
+++ b/playbooks/aws/README.md
@@ -75,7 +75,7 @@ If customization is required for the instances, scale groups, or any other confi
 In order to create the bootstrap-able AMI we need to create a basic openshift-ansible inventory.  This enables us to create the AMI using the openshift-ansible node roles.  This inventory should not include any hosts, but certain variables should be defined in the appropriate groups, just as deploying a cluster
 using the normal openshift-ansible method.  See provisioning-inventory.example.ini for an example.
 
-There are more examples of cluster inventory settings [`here`](../../inventory/byo/).
+There are more examples of cluster inventory settings [`here`](../../inventory/).
 
 #### Step 0 (optional)
 
@@ -134,11 +134,11 @@ At this point we have successfully created the infrastructure including the mast
 Now it is time to install Openshift using the openshift-ansible installer.  This can be achieved by running the following playbook:
 
 ```
-$ ansible-playbook -i inventory.yml install.yml @provisioning_vars.yml
+$ ansible-playbook -i inventory.yml install.yml -e @provisioning_vars.yml
 ```
 This playbook accomplishes the following:
 1. Builds a dynamic inventory file by querying AWS.
-2. Runs the [`byo`](../../common/openshift-cluster/config.yml)
+2. Runs the [`deploy_cluster.yml`](../deploy_cluster.yml)
 
 Once this playbook completes, the cluster masters should be installed and configured.
 
diff --git a/playbooks/aws/openshift-cluster/accept.yml b/playbooks/aws/openshift-cluster/accept.yml
index c2c8bea50..e7bed4f6e 100755
--- a/playbooks/aws/openshift-cluster/accept.yml
+++ b/playbooks/aws/openshift-cluster/accept.yml
@@ -14,11 +14,11 @@
       msg: "openshift_aws_region={{ openshift_aws_region | default('us-east-1') }}"
 
   - name: bring lib_openshift into scope
-    include_role:
+    import_role:
       name: lib_openshift
 
   - name: fetch masters
-    ec2_remote_facts:
+    ec2_instance_facts:
       region: "{{ openshift_aws_region | default('us-east-1') }}"
       filters:
         "tag:clusterid": "{{ openshift_aws_clusterid | default('default') }}"
@@ -30,7 +30,7 @@
     until: "'instances' in mastersout and mastersout.instances|length > 0"
 
   - name: fetch new node instances
-    ec2_remote_facts:
+    ec2_instance_facts:
       region: "{{ openshift_aws_region | default('us-east-1') }}"
       filters:
         "tag:clusterid": "{{ openshift_aws_clusterid | default('default') }}"
diff --git a/playbooks/aws/openshift-cluster/build_ami.yml b/playbooks/aws/openshift-cluster/build_ami.yml
index fae30eb0a..5bf4f652a 100644
--- a/playbooks/aws/openshift-cluster/build_ami.yml
+++ b/playbooks/aws/openshift-cluster/build_ami.yml
@@ -17,7 +17,7 @@
     - name: openshift_aws_region
       msg: "openshift_aws_region={{ openshift_aws_region | default('us-east-1') }}"
 
-- include: provision_instance.yml
+- import_playbook: provision_instance.yml
   vars:
     openshift_aws_node_group_type: compute
 
@@ -33,8 +33,8 @@
 
 # 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
+- import_playbook: ../../openshift-node/private/image_prep.yml
 
-- include: seal_ami.yml
+- import_playbook: 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/filter_plugins b/playbooks/aws/openshift-cluster/filter_plugins
deleted file mode 120000
index 99a95e4ca..000000000
--- a/playbooks/aws/openshift-cluster/filter_plugins
+++ /dev/null
@@ -1 +0,0 @@
-../../../filter_plugins
-\ No newline at end of file
diff --git a/playbooks/aws/openshift-cluster/hosted.yml b/playbooks/aws/openshift-cluster/hosted.yml
new file mode 100644
index 000000000..9d9ed29de
--- /dev/null
+++ b/playbooks/aws/openshift-cluster/hosted.yml
@@ -0,0 +1,25 @@
+---
+- import_playbook: ../../openshift-hosted/private/config.yml
+
+- import_playbook: ../../openshift-metrics/private/config.yml
+  when: openshift_metrics_install_metrics | default(false) | bool
+
+- import_playbook: ../../openshift-logging/private/config.yml
+  when: openshift_logging_install_logging | default(false) | bool
+
+- import_playbook: ../../openshift-prometheus/private/config.yml
+  when: openshift_hosted_prometheus_deploy | default(false) | bool
+
+- import_playbook: ../../openshift-service-catalog/private/config.yml
+  when: openshift_enable_service_catalog | default(false) | bool
+
+- import_playbook: ../../openshift-management/private/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 4d0bf9531..b03fb0b7f 100644
--- a/playbooks/aws/openshift-cluster/install.yml
+++ b/playbooks/aws/openshift-cluster/install.yml
@@ -15,11 +15,32 @@
       name: openshift_aws
       tasks_from: master_facts.yml
 
-- name: normalize groups
-  include: ../../byo/openshift-cluster/initialize_groups.yml
+- name: run the init
+  import_playbook: ../../init/main.yml
 
-- name: run the std_include
-  include: ../../common/openshift-cluster/std_include.yml
+- name: perform the installer openshift-checks
+  import_playbook: ../../openshift-checks/private/install.yml
 
-- name: run the config
-  include: ../../common/openshift-cluster/config.yml
+- name: etcd install
+  import_playbook: ../../openshift-etcd/private/config.yml
+
+- name: include nfs
+  import_playbook: ../../openshift-nfs/private/config.yml
+  when: groups.oo_nfs_to_config | default([]) | count > 0
+
+- name: include loadbalancer
+  import_playbook: ../../openshift-loadbalancer/private/config.yml
+  when: groups.oo_lb_to_config | default([]) | count > 0
+
+- name: include openshift-master config
+  import_playbook: ../../openshift-master/private/config.yml
+
+- name: include master additional config
+  import_playbook: ../../openshift-master/private/additional_config.yml
+
+- name: include master additional config
+  import_playbook: ../../openshift-node/private/config.yml
+
+- name: include openshift-glusterfs
+  import_playbook: ../../openshift-glusterfs/private/config.yml
+  when: groups.oo_glusterfs_to_config | default([]) | count > 0
diff --git a/playbooks/aws/openshift-cluster/lookup_plugins b/playbooks/aws/openshift-cluster/lookup_plugins
deleted file mode 120000
index ac79701db..000000000
--- a/playbooks/aws/openshift-cluster/lookup_plugins
+++ /dev/null
@@ -1 +0,0 @@
-../../../lookup_plugins
-\ No newline at end of file
diff --git a/playbooks/aws/openshift-cluster/prerequisites.yml b/playbooks/aws/openshift-cluster/prerequisites.yml
index df77fe3bc..0afcce331 100644
--- a/playbooks/aws/openshift-cluster/prerequisites.yml
+++ b/playbooks/aws/openshift-cluster/prerequisites.yml
@@ -1,8 +1,6 @@
 ---
-- include: provision_vpc.yml
+- import_playbook: provision_vpc.yml
 
-- include: provision_ssh_keypair.yml
+- import_playbook: provision_ssh_keypair.yml
 
-- include: provision_sec_group.yml
-  vars:
-    openshift_aws_node_group_type: compute
+- import_playbook: provision_sec_group.yml
diff --git a/playbooks/aws/openshift-cluster/provision_install.yml b/playbooks/aws/openshift-cluster/provision_install.yml
index e787deced..f98f5be9a 100644
--- a/playbooks/aws/openshift-cluster/provision_install.yml
+++ b/playbooks/aws/openshift-cluster/provision_install.yml
@@ -4,13 +4,16 @@
 # this playbook is run with the following parameters:
 # ansible-playbook -i openshift-ansible-inventory provision_install.yml
 - name: Include the provision.yml playbook to create cluster
-  include: provision.yml
+  import_playbook: provision.yml
 
-- name: Include the install.yml playbook to install cluster
-  include: install.yml
+- name: Include the install.yml playbook to install cluster on masters
+  import_playbook: install.yml
 
-- name: Include the install.yml playbook to install cluster
-  include: provision_nodes.yml
+- name: provision the infra/compute playbook to install node resources
+  import_playbook: provision_nodes.yml
 
 - name: Include the accept.yml playbook to accept nodes into the cluster
-  include: accept.yml
+  import_playbook: accept.yml
+
+- name: Include the hosted.yml playbook to finish the hosted configuration
+  import_playbook: hosted.yml
diff --git a/playbooks/aws/openshift-cluster/provision_sec_group.yml b/playbooks/aws/openshift-cluster/provision_sec_group.yml
index 039357adb..7d74a691a 100644
--- a/playbooks/aws/openshift-cluster/provision_sec_group.yml
+++ b/playbooks/aws/openshift-cluster/provision_sec_group.yml
@@ -6,7 +6,7 @@
   connection: local
   gather_facts: no
   tasks:
-  - name: create an instance and prepare for ami
+  - name: create security groups
     include_role:
       name: openshift_aws
       tasks_from: security_group.yml
diff --git a/playbooks/aws/provisioning-inventory.example.ini b/playbooks/aws/provisioning-inventory.example.ini
index 238a7eb2f..cf76c9d10 100644
--- a/playbooks/aws/provisioning-inventory.example.ini
+++ b/playbooks/aws/provisioning-inventory.example.ini
@@ -11,6 +11,7 @@ etcd
 openshift_deployment_type=origin
 
 openshift_master_bootstrap_enabled=True
+openshift_master_api_port=443
 
 openshift_hosted_router_wait=False
 openshift_hosted_registry_wait=False