diff options
| author | Brenton Leanhardt <bleanhar@redhat.com> | 2015-08-17 10:53:30 -0400 | 
|---|---|---|
| committer | Brenton Leanhardt <bleanhar@redhat.com> | 2015-08-17 10:53:30 -0400 | 
| commit | f96e82f627b63bf0449eecdd21f85a29ad4210e8 (patch) | |
| tree | b11322657e5bc77a615e7d29a8b464c995c2f04b | |
| parent | 08668227fee0f69a2a24430e196a0179511ae5a1 (diff) | |
| parent | 7aeadcf61aef6256962a4859f4753b69c8fccc0f (diff) | |
Merge pull request #405 from sdodson/loglevel2
Set loglevel=2 as our default across the board
| -rw-r--r-- | playbooks/aws/openshift-cluster/config.yml | 2 | ||||
| -rw-r--r-- | playbooks/byo/openshift-cluster/config.yml | 2 | ||||
| -rw-r--r-- | playbooks/gce/openshift-cluster/config.yml | 2 | ||||
| -rw-r--r-- | playbooks/libvirt/openshift-cluster/config.yml | 2 | ||||
| -rw-r--r-- | playbooks/openstack/openshift-cluster/config.yml | 2 | ||||
| -rw-r--r-- | roles/openshift_common/README.md | 2 | ||||
| -rw-r--r-- | roles/openshift_common/defaults/main.yml | 2 | ||||
| -rw-r--r-- | roles/openshift_common/tasks/main.yml | 2 | ||||
| -rw-r--r-- | roles/openshift_master/README.md | 2 | ||||
| -rw-r--r-- | roles/openshift_node/README.md | 4 | ||||
| -rw-r--r-- | roles/openshift_registry/README.md | 3 | ||||
| -rw-r--r-- | roles/openshift_router/README.md | 3 | 
12 files changed, 13 insertions, 15 deletions
diff --git a/playbooks/aws/openshift-cluster/config.yml b/playbooks/aws/openshift-cluster/config.yml index 8106d5da9..a8e3e27bb 100644 --- a/playbooks/aws/openshift-cluster/config.yml +++ b/playbooks/aws/openshift-cluster/config.yml @@ -17,7 +17,7 @@      g_sudo: "{{ hostvars.localhost.g_sudo_tmp }}"      g_nodeonmaster: true      openshift_cluster_id: "{{ cluster_id }}" -    openshift_debug_level: 4 +    openshift_debug_level: 2      openshift_deployment_type: "{{ deployment_type }}"      openshift_hostname: "{{ ec2_private_ip_address }}"      openshift_public_hostname: "{{ ec2_ip_address }}" diff --git a/playbooks/byo/openshift-cluster/config.yml b/playbooks/byo/openshift-cluster/config.yml index 2ee1d50a7..9e50a4a18 100644 --- a/playbooks/byo/openshift-cluster/config.yml +++ b/playbooks/byo/openshift-cluster/config.yml @@ -5,5 +5,5 @@      g_masters_group: "{{ 'masters' }}"      g_nodes_group: "{{ 'nodes' }}"      openshift_cluster_id: "{{ cluster_id | default('default') }}" -    openshift_debug_level: 4 +    openshift_debug_level: 2      openshift_deployment_type: "{{ deployment_type }}" diff --git a/playbooks/gce/openshift-cluster/config.yml b/playbooks/gce/openshift-cluster/config.yml index 219ebe6a0..fd5dfcc72 100644 --- a/playbooks/gce/openshift-cluster/config.yml +++ b/playbooks/gce/openshift-cluster/config.yml @@ -19,6 +19,6 @@      g_ssh_user: "{{ hostvars.localhost.g_ssh_user_tmp }}"      g_sudo: "{{ hostvars.localhost.g_sudo_tmp }}"      openshift_cluster_id: "{{ cluster_id }}" -    openshift_debug_level: 4 +    openshift_debug_level: 2      openshift_deployment_type: "{{ deployment_type }}"      openshift_hostname: "{{ gce_private_ip }}" diff --git a/playbooks/libvirt/openshift-cluster/config.yml b/playbooks/libvirt/openshift-cluster/config.yml index 98fe11251..c208eee81 100644 --- a/playbooks/libvirt/openshift-cluster/config.yml +++ b/playbooks/libvirt/openshift-cluster/config.yml @@ -20,5 +20,5 @@      g_ssh_user: "{{ hostvars.localhost.g_ssh_user_tmp }}"      g_sudo: "{{ hostvars.localhost.g_sudo_tmp }}"      openshift_cluster_id: "{{ cluster_id }}" -    openshift_debug_level: 4 +    openshift_debug_level: 2      openshift_deployment_type: "{{ deployment_type }}" diff --git a/playbooks/openstack/openshift-cluster/config.yml b/playbooks/openstack/openshift-cluster/config.yml index 3c9a231e3..a5ee2d6a5 100644 --- a/playbooks/openstack/openshift-cluster/config.yml +++ b/playbooks/openstack/openshift-cluster/config.yml @@ -15,6 +15,6 @@      g_ssh_user: "{{ hostvars.localhost.g_ssh_user_tmp }}"      g_sudo: "{{ hostvars.localhost.g_sudo_tmp }}"      openshift_cluster_id: "{{ cluster_id }}" -    openshift_debug_level: 4 +    openshift_debug_level: 2      openshift_deployment_type: "{{ deployment_type }}"      openshift_hostname: "{{ ansible_default_ipv4.address }}" diff --git a/roles/openshift_common/README.md b/roles/openshift_common/README.md index 1eb04626f..87306d4a6 100644 --- a/roles/openshift_common/README.md +++ b/roles/openshift_common/README.md @@ -15,7 +15,7 @@ Role Variables  | Name                      | Default value     |                                             |  |---------------------------|-------------------|---------------------------------------------|  | openshift_cluster_id      | default           | Cluster name if multiple OpenShift clusters | -| openshift_debug_level     | 0                 | Global openshift debug log verbosity        | +| openshift_debug_level     | 2                 | Global openshift debug log verbosity        |  | openshift_hostname        | UNDEF             | Internal hostname to use for this host (this value will set the hostname on the system) |  | openshift_ip              | UNDEF             | Internal IP address to use for this host    |  | openshift_public_hostname | UNDEF             | Public hostname to use for this host        | diff --git a/roles/openshift_common/defaults/main.yml b/roles/openshift_common/defaults/main.yml index 4d3e0fe9e..267c03605 100644 --- a/roles/openshift_common/defaults/main.yml +++ b/roles/openshift_common/defaults/main.yml @@ -1,3 +1,3 @@  ---  openshift_cluster_id: 'default' -openshift_debug_level: 0 +openshift_debug_level: 2 diff --git a/roles/openshift_common/tasks/main.yml b/roles/openshift_common/tasks/main.yml index a7c565067..09cc4aaf7 100644 --- a/roles/openshift_common/tasks/main.yml +++ b/roles/openshift_common/tasks/main.yml @@ -4,7 +4,7 @@      role: common      local_facts:        cluster_id: "{{ openshift_cluster_id | default('default') }}" -      debug_level: "{{ openshift_debug_level | default(0) }}" +      debug_level: "{{ openshift_debug_level | default(2) }}"        hostname: "{{ openshift_hostname | default(None) }}"        ip: "{{ openshift_ip | default(None) }}"        public_hostname: "{{ openshift_public_hostname | default(None) }}" diff --git a/roles/openshift_master/README.md b/roles/openshift_master/README.md index 19f77d145..0e7ef3aab 100644 --- a/roles/openshift_master/README.md +++ b/roles/openshift_master/README.md @@ -28,7 +28,7 @@ From this role:  From openshift_common:  | Name                          | Default Value  |                                        |  |-------------------------------|----------------|----------------------------------------| -| openshift_debug_level         | 0              | Global openshift debug log verbosity   | +| openshift_debug_level         | 2              | Global openshift debug log verbosity   |  | openshift_public_ip           | UNDEF          | Public IP address to use for this host |  | openshift_hostname            | UNDEF          | hostname to use for this instance      | diff --git a/roles/openshift_node/README.md b/roles/openshift_node/README.md index 300e6b495..427269931 100644 --- a/roles/openshift_node/README.md +++ b/roles/openshift_node/README.md @@ -20,9 +20,9 @@ From this role:  | oreg_url                                 | UNDEF (Optional)      | Default docker registry to use |  From openshift_common: -| Name                          |  Default Value      |                     |  +| Name                          |  Default Value      |                     |  |-------------------------------|---------------------|---------------------| -| openshift_debug_level         | 0                   | Global openshift debug log verbosity | +| openshift_debug_level         | 2                   | Global openshift debug log verbosity |  | openshift_public_ip           | UNDEF (Required)    | Public IP address to use for this host |  | openshift_hostname            | UNDEF (Required)    | hostname to use for this instance | diff --git a/roles/openshift_registry/README.md b/roles/openshift_registry/README.md index ec3b4a10b..8e66c483b 100644 --- a/roles/openshift_registry/README.md +++ b/roles/openshift_registry/README.md @@ -21,7 +21,7 @@ From openshift_common:  | Name                  | Default value |                                      |  |-----------------------|---------------|--------------------------------------| -| openshift_debug_level | 0             | Global openshift debug log verbosity | +| openshift_debug_level | 2             | Global openshift debug log verbosity |  Dependencies @@ -41,4 +41,3 @@ Author Information  ------------------  Red Hat openshift@redhat.com - diff --git a/roles/openshift_router/README.md b/roles/openshift_router/README.md index 6d8ee25c6..836efc443 100644 --- a/roles/openshift_router/README.md +++ b/roles/openshift_router/README.md @@ -19,7 +19,7 @@ From this role:  From openshift_common:  | Name                  | Default value |                                      |  |-----------------------|---------------|--------------------------------------| -| openshift_debug_level | 0             | Global openshift debug log verbosity | +| openshift_debug_level | 2             | Global openshift debug log verbosity |  Dependencies  ------------ @@ -38,4 +38,3 @@ Author Information  ------------------  Red Hat openshift@redhat.com -  | 
