diff options
| author | Brenton Leanhardt <bleanhar@redhat.com> | 2016-02-15 11:32:41 -0500 |
|---|---|---|
| committer | Brenton Leanhardt <bleanhar@redhat.com> | 2016-02-15 11:32:41 -0500 |
| commit | 9734dbb505537355222cb672ac69c0abde381660 (patch) | |
| tree | 6ae979c0c3dd824b0f26da14d2d802a945bd4f9f | |
| parent | 65e8d09e50a269be1dabb00b0db0890c8f6cf014 (diff) | |
| parent | b54e98e2d4feb9c1cc642643bdf62945a3d5aea7 (diff) | |
| download | openshift-9734dbb505537355222cb672ac69c0abde381660.tar.gz openshift-9734dbb505537355222cb672ac69c0abde381660.tar.bz2 openshift-9734dbb505537355222cb672ac69c0abde381660.tar.xz openshift-9734dbb505537355222cb672ac69c0abde381660.zip | |
Merge pull request #1397 from brenton/bz1308314
Bug 1308314 - Failed to continue installation when pressing CTRL-C
| -rw-r--r-- | playbooks/common/openshift-cluster/validate_hostnames.yml | 2 | ||||
| -rw-r--r-- | roles/openshift_master/tasks/main.yml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/playbooks/common/openshift-cluster/validate_hostnames.yml b/playbooks/common/openshift-cluster/validate_hostnames.yml index 047431b63..fd82997b9 100644 --- a/playbooks/common/openshift-cluster/validate_hostnames.yml +++ b/playbooks/common/openshift-cluster/validate_hostnames.yml @@ -21,6 +21,6 @@ failed_when: false - name: Warn user about bad openshift_hostname values pause: - prompt: "The hostname \"{{ openshift.common.hostname }}\" for \"{{ ansible_nodename }}\" doesn't resolve to an ip address owned by this host. Please set openshift_hostname variable to a hostname that when resolved on the host in question resolves to an IP address matching an interface on this host. This host will fail liveness checks for pods utilizing hostPorts, press CTRL-C to continue." + prompt: "The hostname \"{{ openshift.common.hostname }}\" for \"{{ ansible_nodename }}\" doesn't resolve to an ip address owned by this host. Please set openshift_hostname variable to a hostname that when resolved on the host in question resolves to an IP address matching an interface on this host. This host will fail liveness checks for pods utilizing hostPorts, press ENTER to continue or CTRL-C to abort." seconds: "{{ 10 if openshift_override_hostname_check | default(false) | bool else omit }}" when: lookupip.stdout not in ansible_all_ipv4_addresses diff --git a/roles/openshift_master/tasks/main.yml b/roles/openshift_master/tasks/main.yml index 4aede31f6..23dfacf79 100644 --- a/roles/openshift_master/tasks/main.yml +++ b/roles/openshift_master/tasks/main.yml @@ -259,7 +259,7 @@ - name: Mask master service command: systemctl mask {{ openshift.common.service_type }}-master - when: openshift_master_ha | bool and openshift.master.cluster_method == 'native' and not openshift.common.is_atomic | bool + when: openshift_master_ha | bool and openshift.master.cluster_method == 'native' and not openshift.common.is_containerized | bool - name: Start and enable master api service: name={{ openshift.common.service_type }}-master-api enabled=yes state=started |