diff options
| author | Michael Gugino <gugino.michael@yahoo.com> | 2017-11-28 10:34:48 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-28 10:34:48 -0500 |
| commit | b6af2d0e1fb471c9bc5f7e41d077ba50f7b842d0 (patch) | |
| tree | d9ae51dfc654e8a88c189a975bebfb5bbdbcd80e | |
| parent | b9ab765528ff2e7f9aa46b6942d74027ef9b6799 (diff) | |
| parent | 08fca0216aeddf24f8c1a4e33fa522021fad249f (diff) | |
Merge pull request #6269 from mgugino-upstream-stage/clock-depends
Remove openshift_clock from meta depends
| -rw-r--r-- | playbooks/openshift-etcd/private/ca.yml | 1 | ||||
| -rw-r--r-- | playbooks/openshift-etcd/private/config.yml | 1 | ||||
| -rw-r--r-- | playbooks/openshift-node/private/configure_nodes.yml | 1 | ||||
| -rw-r--r-- | playbooks/openshift-node/private/containerized_nodes.yml | 1 | ||||
| -rw-r--r-- | roles/openshift_etcd/meta/main.yml | 1 | ||||
| -rw-r--r-- | roles/openshift_node/meta/main.yml | 2 |
6 files changed, 4 insertions, 3 deletions
diff --git a/playbooks/openshift-etcd/private/ca.yml b/playbooks/openshift-etcd/private/ca.yml index ac5543be9..c9f186e72 100644 --- a/playbooks/openshift-etcd/private/ca.yml +++ b/playbooks/openshift-etcd/private/ca.yml @@ -2,6 +2,7 @@ - name: Generate new etcd CA hosts: oo_first_etcd roles: + - role: openshift_clock - role: openshift_etcd_facts tasks: - include_role: diff --git a/playbooks/openshift-etcd/private/config.yml b/playbooks/openshift-etcd/private/config.yml index f49a3ecaa..3d6c79834 100644 --- a/playbooks/openshift-etcd/private/config.yml +++ b/playbooks/openshift-etcd/private/config.yml @@ -20,6 +20,7 @@ any_errors_fatal: true roles: - role: os_firewall + - role: openshift_clock - role: openshift_etcd etcd_peers: "{{ groups.oo_etcd_to_config | default([], true) }}" etcd_ca_host: "{{ groups.oo_etcd_to_config.0 }}" diff --git a/playbooks/openshift-node/private/configure_nodes.yml b/playbooks/openshift-node/private/configure_nodes.yml index 17259422d..06f3df9fa 100644 --- a/playbooks/openshift-node/private/configure_nodes.yml +++ b/playbooks/openshift-node/private/configure_nodes.yml @@ -12,6 +12,7 @@ }}" roles: - role: os_firewall + - role: openshift_clock - role: openshift_node - role: tuned - role: nickhammond.logrotate diff --git a/playbooks/openshift-node/private/containerized_nodes.yml b/playbooks/openshift-node/private/containerized_nodes.yml index 6fac937e3..3c3ac3646 100644 --- a/playbooks/openshift-node/private/containerized_nodes.yml +++ b/playbooks/openshift-node/private/containerized_nodes.yml @@ -14,6 +14,7 @@ roles: - role: os_firewall + - role: openshift_clock - role: openshift_node openshift_ca_host: "{{ groups.oo_first_master.0 }}" - role: nickhammond.logrotate diff --git a/roles/openshift_etcd/meta/main.yml b/roles/openshift_etcd/meta/main.yml index de36b201b..7cc548f69 100644 --- a/roles/openshift_etcd/meta/main.yml +++ b/roles/openshift_etcd/meta/main.yml @@ -13,7 +13,6 @@ galaxy_info: - cloud dependencies: - role: openshift_etcd_facts -- role: openshift_clock - role: openshift_docker when: openshift.common.is_containerized | bool - role: etcd diff --git a/roles/openshift_node/meta/main.yml b/roles/openshift_node/meta/main.yml index 373e0e1bd..927d107c6 100644 --- a/roles/openshift_node/meta/main.yml +++ b/roles/openshift_node/meta/main.yml @@ -17,8 +17,6 @@ dependencies: - role: lib_openshift - role: lib_os_firewall when: not (openshift_node_upgrade_in_progress | default(False)) -- role: openshift_clock - when: not (openshift_node_upgrade_in_progress | default(False)) - role: openshift_docker - role: openshift_cloud_provider when: not (openshift_node_upgrade_in_progress | default(False)) |