summaryrefslogtreecommitdiffstats
path: root/playbooks
diff options
context:
space:
mode:
authorJason DeTiberus <jdetiber@redhat.com>2015-03-18 17:15:19 -0400
committerJason DeTiberus <jdetiber@redhat.com>2015-03-18 17:23:59 -0400
commit8613b70503d2d1cbe57ddebc11919edeb26eaadc (patch)
tree92a6a85e4b8e670ace8c6b518d93807059ddd285 /playbooks
parentdb9cf8ef4f030f30391e021f360fe0c3db1dce74 (diff)
downloadopenshift-8613b70503d2d1cbe57ddebc11919edeb26eaadc.tar.gz
openshift-8613b70503d2d1cbe57ddebc11919edeb26eaadc.tar.bz2
openshift-8613b70503d2d1cbe57ddebc11919edeb26eaadc.tar.xz
openshift-8613b70503d2d1cbe57ddebc11919edeb26eaadc.zip
Rename repos role to openshift_repos
- Rename repos role to openshift_repos - Make openshift_repos a dependency of openshift_common - Add README and metadata for openshift_repos - Playbook updates for role rename - Verify libselinux-python is installed, otherwise some of the bulit-in modules we use fail
Diffstat (limited to 'playbooks')
-rw-r--r--playbooks/aws/openshift-master/config.yml1
-rw-r--r--playbooks/aws/openshift-node/config.yml3
-rw-r--r--playbooks/gce/openshift-master/config.yml1
-rw-r--r--playbooks/gce/openshift-node/config.yml3
4 files changed, 2 insertions, 6 deletions
diff --git a/playbooks/aws/openshift-master/config.yml b/playbooks/aws/openshift-master/config.yml
index 454cd6f24..3d6238360 100644
--- a/playbooks/aws/openshift-master/config.yml
+++ b/playbooks/aws/openshift-master/config.yml
@@ -31,7 +31,6 @@
vars_files:
- vars.yml
roles:
- - repos
- {
role: openshift_master,
openshift_node_ips: "{{ hostvars['localhost'].openshift_node_ips | default(['']) }}",
diff --git a/playbooks/aws/openshift-node/config.yml b/playbooks/aws/openshift-node/config.yml
index 9662168c4..d39ad781f 100644
--- a/playbooks/aws/openshift-node/config.yml
+++ b/playbooks/aws/openshift-node/config.yml
@@ -37,8 +37,6 @@
vars_files:
- vars.yml
roles:
- - repos
- - docker
- {
role: openshift_node,
openshift_master_ips: "{{ hostvars['localhost'].openshift_master_ips | default(['']) }}",
@@ -46,4 +44,5 @@
openshift_env: "{{ oo_env }}"
openshift_public_ip: "{{ ec2_ip_address }}"
}
+ - docker
- os_env_extras
diff --git a/playbooks/gce/openshift-master/config.yml b/playbooks/gce/openshift-master/config.yml
index ae598b622..a74250d13 100644
--- a/playbooks/gce/openshift-master/config.yml
+++ b/playbooks/gce/openshift-master/config.yml
@@ -31,7 +31,6 @@
vars_files:
- vars.yml
roles:
- - repos
- {
role: openshift_master,
openshift_node_ips: "{{ hostvars['localhost'].openshift_node_ips | default(['']) }}",
diff --git a/playbooks/gce/openshift-node/config.yml b/playbooks/gce/openshift-node/config.yml
index 85f34e814..78047cf40 100644
--- a/playbooks/gce/openshift-node/config.yml
+++ b/playbooks/gce/openshift-node/config.yml
@@ -37,8 +37,6 @@
vars_files:
- vars.yml
roles:
- - repos
- - docker
- {
role: openshift_node,
openshift_master_ips: "{{ hostvars['localhost'].openshift_master_ips | default(['']) }}",
@@ -46,4 +44,5 @@
openshift_public_ip: "{{ gce_public_ip }}",
openshift_env: "{{ oo_env }}",
}
+ - docker
- os_env_extras