diff options
| author | OpenShift Bot <eparis+openshiftbot@redhat.com> | 2017-05-02 16:31:41 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-05-02 16:31:41 -0500 |
| commit | d045a07f4929cf8722844577e2c73a544c189c64 (patch) | |
| tree | c431a9cbb0892f0ed5fcc2b25685a9714e9a8a41 /playbooks/common | |
| parent | 18eb563108c8c49c2ebbcf13a310bbc1050d2d9f (diff) | |
| parent | 93b380ec368767acde884e4844439e6ad5ae5e98 (diff) | |
| download | openshift-d045a07f4929cf8722844577e2c73a544c189c64.tar.gz openshift-d045a07f4929cf8722844577e2c73a544c189c64.tar.bz2 openshift-d045a07f4929cf8722844577e2c73a544c189c64.tar.xz openshift-d045a07f4929cf8722844577e2c73a544c189c64.zip | |
Merge pull request #4045 from kwoodson/normalize_groups
Merged by openshift-bot
Diffstat (limited to 'playbooks/common')
| -rw-r--r-- | playbooks/common/openshift-cluster/initialize_openshift_version.yml | 3 | ||||
| -rw-r--r-- | playbooks/common/openshift-master/scaleup.yml | 2 | ||||
| -rw-r--r-- | playbooks/common/openshift-node/network_manager.yml | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/playbooks/common/openshift-cluster/initialize_openshift_version.yml b/playbooks/common/openshift-cluster/initialize_openshift_version.yml index 88f82f6f2..f4e52869e 100644 --- a/playbooks/common/openshift-cluster/initialize_openshift_version.yml +++ b/playbooks/common/openshift-cluster/initialize_openshift_version.yml @@ -1,13 +1,14 @@ --- # NOTE: requires openshift_facts be run - name: Verify compatible yum/subscription-manager combination - hosts: l_oo_all_hosts + hosts: oo_all_hosts gather_facts: no tasks: # See: # https://bugzilla.redhat.com/show_bug.cgi?id=1395047 # https://bugzilla.redhat.com/show_bug.cgi?id=1282961 # https://github.com/openshift/openshift-ansible/issues/1138 + # Consider the repoquery module for this work - name: Check for bad combinations of yum and subscription-manager command: > {{ repoquery_cmd }} --installed --qf '%{version}' "yum" diff --git a/playbooks/common/openshift-master/scaleup.yml b/playbooks/common/openshift-master/scaleup.yml index 92f16dc47..ab0045a39 100644 --- a/playbooks/common/openshift-master/scaleup.yml +++ b/playbooks/common/openshift-master/scaleup.yml @@ -51,7 +51,7 @@ changed_when: false - name: Configure docker hosts - hosts: oo_masters_to-config:oo_nodes_to_config + hosts: oo_masters_to_config:oo_nodes_to_config vars: docker_additional_registries: "{{ lookup('oo_option', 'docker_additional_registries') | oo_split }}" docker_insecure_registries: "{{ lookup('oo_option', 'docker_insecure_registries') | oo_split }}" diff --git a/playbooks/common/openshift-node/network_manager.yml b/playbooks/common/openshift-node/network_manager.yml index be050c12c..0014a5dbd 100644 --- a/playbooks/common/openshift-node/network_manager.yml +++ b/playbooks/common/openshift-node/network_manager.yml @@ -1,6 +1,6 @@ --- - name: Install and configure NetworkManager - hosts: l_oo_all_hosts + hosts: oo_all_hosts become: yes tasks: - name: install NetworkManager |