22 files changed, 45 insertions, 17 deletions
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000..9dcdf22c4
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,15 @@
+*~
+#*#
+.idea
+*.iml
+*.komodoproject
+.loadpath
+.project
+*.pyc
+.pydevproject
+*.pyo
+*.redcar*
+.*.swp
+.sass-cache
+.rvmrc
+.DS_Store
diff --git a/cluster.sh b/cluster.sh
index 3aaabd07d..6363e1e8d 100755
--- a/cluster.sh
+++ b/cluster.sh
@@ -23,25 +23,27 @@ EOT
 # @formatter:on
 
 function create_cluser {
+    for (( i = 0; i < $MASTERS; i ++ )); do
+        ./cloud.rb "${PROVIDER}" launch -e "${ENV}" --type=$MASTER_PLAYBOOK
+    done
+
     for (( i = 0; i < $MINIONS; i ++ )); do
         ./cloud.rb "${PROVIDER}" launch -e "${ENV}" --type=$MINION_PLAYBOOK
     done
 
-    for (( i = 0; i < $MASTERS; i ++ )); do
-        ./cloud.rb "${PROVIDER}" launch -e "${ENV}" --type=$MASTER_PLAYBOOK
-    done
     update_cluster
-    echo -e "\nCreated ${MASTERS} ${MASTER_PLAYBOOK} masters and ${MINIONS} ${MINION_PLAYBOOK} minions using ${PROVIDER} provider\n"
+
+    echo -e "\nCreated ${MASTERS}/${MASTER_PLAYBOOK} masters and ${MINIONS}/${MINION_PLAYBOOK} minions using ${PROVIDER} provider\n"
 }
 
 function update_cluster {
-    for (( i = 0; i < $MINIONS; i ++ )); do
-        ./cloud.rb "${PROVIDER}" config -e "${ENV}" --type=$MINION_PLAYBOOK
-    done
-
     for (( i = 0; i < $MASTERS; i ++ )); do
         ./cloud.rb "${PROVIDER}" config -e "${ENV}" --type=$MASTER_PLAYBOOK
     done
+
+    for (( i = 0; i < $MINIONS; i ++ )); do
+        ./cloud.rb "${PROVIDER}" config -e "${ENV}" --type=$MINION_PLAYBOOK
+    done
 }
 
 function terminate_cluster {
diff --git a/playbooks/gce/origin-master/config.yml b/playbooks/gce/openshift-master/config.yml
index 681f804cc..681f804cc 100644
--- a/playbooks/gce/origin-master/config.yml
+++ b/playbooks/gce/openshift-master/config.yml
diff --git a/playbooks/gce/origin-master/launch.yml b/playbooks/gce/openshift-master/launch.yml
index 0a3ac3fdd..0a3ac3fdd 100644
--- a/playbooks/gce/origin-master/launch.yml
+++ b/playbooks/gce/openshift-master/launch.yml
diff --git a/playbooks/gce/origin-master/terminate.yml b/playbooks/gce/openshift-master/terminate.yml
index 76e1404b5..76e1404b5 100644
--- a/playbooks/gce/origin-master/terminate.yml
+++ b/playbooks/gce/openshift-master/terminate.yml
diff --git a/playbooks/gce/origin-master/vars.yml b/playbooks/gce/openshift-master/vars.yml
index e69de29bb..e69de29bb 100644
--- a/playbooks/gce/origin-master/vars.yml
+++ b/playbooks/gce/openshift-master/vars.yml
diff --git a/playbooks/gce/origin-minion/config.yml b/playbooks/gce/openshift-minion/config.yml
index 0a92d41c7..0a92d41c7 100644
--- a/playbooks/gce/origin-minion/config.yml
+++ b/playbooks/gce/openshift-minion/config.yml
diff --git a/playbooks/gce/origin-minion/launch.yml b/playbooks/gce/openshift-minion/launch.yml
index 0a3ac3fdd..0a3ac3fdd 100644
--- a/playbooks/gce/origin-minion/launch.yml
+++ b/playbooks/gce/openshift-minion/launch.yml
diff --git a/playbooks/gce/origin-minion/terminate.yml b/playbooks/gce/openshift-minion/terminate.yml
index 97b31eca0..97b31eca0 100644
--- a/playbooks/gce/origin-minion/terminate.yml
+++ b/playbooks/gce/openshift-minion/terminate.yml
diff --git a/playbooks/gce/origin-minion/vars.yml b/playbooks/gce/openshift-minion/vars.yml
index e69de29bb..e69de29bb 100644
--- a/playbooks/gce/origin-minion/vars.yml
+++ b/playbooks/gce/openshift-minion/vars.yml
diff --git a/roles/origin_master/README.md b/roles/openshift_master/README.md
index 225dd44b9..225dd44b9 100644
--- a/roles/origin_master/README.md
+++ b/roles/openshift_master/README.md
diff --git a/roles/origin_master/defaults/main.yml b/roles/openshift_master/defaults/main.yml
index c7d14b676..c7d14b676 100644
--- a/roles/origin_master/defaults/main.yml
+++ b/roles/openshift_master/defaults/main.yml
diff --git a/roles/origin_master/handlers/main.yml b/roles/openshift_master/handlers/main.yml
index 216af5dc9..216af5dc9 100644
--- a/roles/origin_master/handlers/main.yml
+++ b/roles/openshift_master/handlers/main.yml
diff --git a/roles/origin_master/meta/main.yml b/roles/openshift_master/meta/main.yml
index c5c362c60..c5c362c60 100644
--- a/roles/origin_master/meta/main.yml
+++ b/roles/openshift_master/meta/main.yml
diff --git a/roles/origin_master/tasks/main.yml b/roles/openshift_master/tasks/main.yml
index 3963b5090..5a940c88a 100644
--- a/roles/origin_master/tasks/main.yml
+++ b/roles/openshift_master/tasks/main.yml
@@ -1,7 +1,7 @@
 ---
 # tasks file for openshift_master
 - name: Install Origin
-  yum: pkg=openshift state=installed
+  yum: pkg=origin state=installed
 
 - name: Configure Origin settings
   lineinfile: >
@@ -14,12 +14,17 @@
   notify:
     - restart openshift-master
 
-- name: Enable OpenShift
-  service: name=openshift enabled=yes state=started
+- name: Open firewalld port for etcd embedded in OpenShift
+  firewalld: port=4001/tcp permanent=false state=enabled
+
+- name: Save firewalld port for etcd embedded in
+  firewalld: port=4001/tcp permanent=true state=enabled
 
-- name: Open firewalld port for Origin
+- name: Open firewalld port for OpenShift
   firewalld: port=8080/tcp permanent=false state=enabled
 
-- name: Save firewalld port for Origin
+- name: Save firewalld port for OpenShift
   firewalld: port=8080/tcp permanent=true state=enabled
 
+- name: Enable OpenShift
+  service: name=openshift enabled=yes state=started
diff --git a/roles/origin_master/vars/main.yml b/roles/openshift_master/vars/main.yml
index 1f5cb46d6..1f5cb46d6 100644
--- a/roles/origin_master/vars/main.yml
+++ b/roles/openshift_master/vars/main.yml
diff --git a/roles/origin_minion/README.md b/roles/openshift_minion/README.md
index 225dd44b9..225dd44b9 100644
--- a/roles/origin_minion/README.md
+++ b/roles/openshift_minion/README.md
diff --git a/roles/origin_minion/defaults/main.yml b/roles/openshift_minion/defaults/main.yml
index dfcf3d98f..dfcf3d98f 100644
--- a/roles/origin_minion/defaults/main.yml
+++ b/roles/openshift_minion/defaults/main.yml
diff --git a/roles/origin_minion/handlers/main.yml b/roles/openshift_minion/handlers/main.yml
index 2764456f4..2764456f4 100644
--- a/roles/origin_minion/handlers/main.yml
+++ b/roles/openshift_minion/handlers/main.yml
diff --git a/roles/origin_minion/meta/main.yml b/roles/openshift_minion/meta/main.yml
index c5c362c60..c5c362c60 100644
--- a/roles/origin_minion/meta/main.yml
+++ b/roles/openshift_minion/meta/main.yml
diff --git a/roles/origin_minion/tasks/main.yml b/roles/openshift_minion/tasks/main.yml
index 3bb62b438..c43575945 100644
--- a/roles/origin_minion/tasks/main.yml
+++ b/roles/openshift_minion/tasks/main.yml
@@ -1,7 +1,7 @@
 ---
 # tasks file for openshift_minion
 - name: Install OpenShift
-  yum: pkg=openshift state=installed
+  yum: pkg=origin state=installed
 
 - name: Configure OpenShift settings
   lineinfile: >
@@ -14,11 +14,17 @@
   notify:
     - restart openshift-minion
 
-- name: Enable OpenShift
-  service: name=openshift enabled=yes state=started
-
 - name: Open firewalld port for OpenShift
   firewalld: port=10250/tcp permanent=false state=enabled
 
 - name: Save firewalld port for OpenShift
   firewalld: port=10250/tcp permanent=true state=enabled
+
+  # POST ${master_ip}:8080/api/v1beta1/minions kind=Minion id=${node_ip} apiVersion=v1beta1 hostIP=${node_ip} >/dev/null
+
+- name: Enable OpenShift
+  service: name=openshift enabled=yes state=started
+
+- name: Register with OpenShift master
+  command: "curl -X POST -H 'Accept: application/json' -d '{\"kind\":\"Minion\", \"id\":\"{{ hostvars[inventory_hostname].ansible_eth0.ipv4.address }}\", \"apiVersion\":\"v1beta1\", \"hostIP\":\"{{ hostvars[inventory_hostname].ansible_eth0.ipv4.address }}\" }' http://{{ oo_master_ips[0] }}:8080/api/v1beta1/minions"
+  when: oo_master_ips[0] != ''
diff --git a/roles/origin_minion/vars/main.yml b/roles/openshift_minion/vars/main.yml
index 715fba487..715fba487 100644
--- a/roles/origin_minion/vars/main.yml
+++ b/roles/openshift_minion/vars/main.yml