diff options
| author | Thomas Wiest <twiest@users.noreply.github.com> | 2015-03-24 09:42:43 -0400 |
|---|---|---|
| committer | Thomas Wiest <twiest@users.noreply.github.com> | 2015-03-24 09:42:43 -0400 |
| commit | 1686e24048b34d365e740f72ab9ad1962c26da2c (patch) | |
| tree | 3544b51039f726813df733142a82f518a33259cc /playbooks | |
| parent | fceb54d257ec0e645533e9f20d002f559433662a (diff) | |
| parent | 8613b70503d2d1cbe57ddebc11919edeb26eaadc (diff) | |
| download | openshift-1686e24048b34d365e740f72ab9ad1962c26da2c.tar.gz openshift-1686e24048b34d365e740f72ab9ad1962c26da2c.tar.bz2 openshift-1686e24048b34d365e740f72ab9ad1962c26da2c.tar.xz openshift-1686e24048b34d365e740f72ab9ad1962c26da2c.zip | |
Merge pull request #117 from detiber/repoRename
Rename repos role to openshift_repos
Diffstat (limited to 'playbooks')
| -rw-r--r-- | playbooks/aws/openshift-master/config.yml | 1 | ||||
| -rw-r--r-- | playbooks/aws/openshift-node/config.yml | 3 | ||||
| -rw-r--r-- | playbooks/gce/openshift-master/config.yml | 1 | ||||
| -rw-r--r-- | playbooks/gce/openshift-node/config.yml | 3 |
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 |