openshift updatequickstart

4 files changed, 20 insertions, 10 deletions

diff --git a/openshift/group_vars/all b/openshift/group_vars/all
index 08c337f..e8ba384 100644
--- a/openshift/group_vars/all
+++ b/openshift/group_vars/all
@@ -2,8 +2,8 @@
 # Global Vars for OpenShift
 
 #EC2 specific varibles
-ec2_access_key: "AKIAQUFDNXQ"
-ec2_secret_key: "RyhzTz1wzZ3kmtMEu"
+ec2_access_key: "AKIUFDNXQ"
+ec2_secret_key: "RyhTz1wzZ3kmtMEu"
 keypair: "axialkey"
 instance_type: "m1.small"
 image: "ami-bf5021d6"
diff --git a/openshift/hosts b/openshift/hosts
index 2c77041..934e5be 100644
--- a/openshift/hosts
+++ b/openshift/hosts
@@ -1,5 +1,6 @@
 [dns]
 vm1
+
 [mongo_servers]
 vm1
 vm2
@@ -11,8 +12,8 @@ vm2
 vm3
 
 [broker]
-vm1
-vm2
+vm6
+vm7
 
 [nodes]
 vm4
diff --git a/openshift/roles/broker/tasks/main.yml b/openshift/roles/broker/tasks/main.yml
index 6e82f51..d49e37d 100644
--- a/openshift/roles/broker/tasks/main.yml
+++ b/openshift/roles/broker/tasks/main.yml
@@ -1,16 +1,19 @@
 ---
 # Tasks for the Openshift broker installation
 
+- name: install mcollective common
+  yum: name=mcollective-common-2.2.1 state=installed
+
+- name: Install the broker components
+  yum: name="{{ item }}" state=installed disablerepo=epel
+  with_items: "{{ broker_packages }}"
+
 - name: Install mcollective
   yum: name=mcollective-client
 
 - name: Copy the mcollective configuration file
   template: src=client.cfg.j2 dest=/etc/mcollective/client.cfg
 
-- name: Install the broker components
-  yum: name="{{ item }}" state=installed
-  with_items: "{{ broker_packages }}"
-
 - name: Copy the rhc client configuration file
   template: src=express.conf.j2 dest=/etc/openshift/express.conf
   register: last_run
diff --git a/openshift/roles/nodes/tasks/main.yml b/openshift/roles/nodes/tasks/main.yml
index 84615c0..6f37b1c 100644
--- a/openshift/roles/nodes/tasks/main.yml
+++ b/openshift/roles/nodes/tasks/main.yml
@@ -2,7 +2,13 @@
 # Tasks for the openshift nodes
 
 - name: Install the mcollective packages
-  yum: name=openshift-origin-msg-node-mcollective state=installed
+  yum: name={{ item }} state=installed 
+  with_items: 
+   - mcollective-common-2.2.1
+
+
+- name: Install the mcollective packages
+  yum: name=openshift-origin-msg-node-mcollective state=installed disablerepo=epel
 
 - name: Copy the mcollective configuration file
   template: src=server.cfg.j2 dest=/etc/mcollective/server.cfg
@@ -12,7 +18,7 @@
   service: name=mcollective state=started enabled=yes
 
 - name: Install OpenShift node packages
-  yum: name="{{ item }}" state=installed
+  yum: name="{{ item }}" state=installed 
   with_items:
       - rubygem-openshift-origin-node 
       - rubygem-openshift-origin-container-selinux.noarch