From e1ff26612f26177163867a649157286bb2bbcd0a Mon Sep 17 00:00:00 2001 From: Ice Yao Date: Wed, 20 Jan 2016 15:13:41 +0800 Subject: [PATCH] remove option verbose define in defaults/main.yml References: https://review.openstack.org/#/c/269042/ TrivialFix Change-Id: Ief08781342a06f956fc4cf00ba4383759da8c897 --- ansible/group_vars/all.yml | 1 - ansible/roles/cinder/defaults/main.yml | 1 - ansible/roles/glance/defaults/main.yml | 1 - ansible/roles/heat/defaults/main.yml | 1 - ansible/roles/ironic/defaults/main.yml | 1 - ansible/roles/keystone/defaults/main.yml | 1 - ansible/roles/magnum/defaults/main.yml | 1 - ansible/roles/mistral/defaults/main.yml | 1 - ansible/roles/murano/defaults/main.yml | 1 - ansible/roles/neutron/defaults/main.yml | 1 - ansible/roles/nova/defaults/main.yml | 1 - ansible/roles/swift/defaults/main.yml | 1 - etc/kolla/globals.yml | 1 - 13 files changed, 13 deletions(-) diff --git a/ansible/group_vars/all.yml b/ansible/group_vars/all.yml index 0d09da0d62..d0ec8472f9 100644 --- a/ansible/group_vars/all.yml +++ b/ansible/group_vars/all.yml @@ -126,7 +126,6 @@ mistral_api_port: "8989" # Openstack options #################### openstack_release: "2.0.0" -openstack_logging_verbose: "True" openstack_logging_debug: "False" openstack_region_name: "RegionOne" diff --git a/ansible/roles/cinder/defaults/main.yml b/ansible/roles/cinder/defaults/main.yml index 688e671499..950898bc94 100644 --- a/ansible/roles/cinder/defaults/main.yml +++ b/ansible/roles/cinder/defaults/main.yml @@ -54,7 +54,6 @@ cinder_public_address: "{{ kolla_external_address }}" cinder_admin_address: "{{ kolla_internal_address }}" cinder_internal_address: "{{ kolla_internal_address }}" -cinder_logging_verbose: "{{ openstack_logging_verbose }}" cinder_logging_debug: "{{ openstack_logging_debug }}" cinder_keystone_user: "cinder" diff --git a/ansible/roles/glance/defaults/main.yml b/ansible/roles/glance/defaults/main.yml index 0a3f9eb5b2..b5e0419470 100644 --- a/ansible/roles/glance/defaults/main.yml +++ b/ansible/roles/glance/defaults/main.yml @@ -41,7 +41,6 @@ glance_public_address: "{{ kolla_external_address }}" glance_admin_address: "{{ kolla_internal_address }}" glance_internal_address: "{{ kolla_internal_address }}" -glance_logging_verbose: "{{ openstack_logging_verbose }}" glance_logging_debug: "{{ openstack_logging_debug }}" glance_keystone_user: "glance" diff --git a/ansible/roles/heat/defaults/main.yml b/ansible/roles/heat/defaults/main.yml index de9d644a87..d0d85e70f2 100644 --- a/ansible/roles/heat/defaults/main.yml +++ b/ansible/roles/heat/defaults/main.yml @@ -31,7 +31,6 @@ heat_public_address: "{{ kolla_external_address }}" heat_admin_address: "{{ kolla_internal_address }}" heat_internal_address: "{{ kolla_internal_address }}" -heat_logging_verbose: "{{ openstack_logging_verbose }}" heat_logging_debug: "{{ openstack_logging_debug }}" heat_keystone_user: "heat" diff --git a/ansible/roles/ironic/defaults/main.yml b/ansible/roles/ironic/defaults/main.yml index 8a9ee32cda..a39102d4f0 100644 --- a/ansible/roles/ironic/defaults/main.yml +++ b/ansible/roles/ironic/defaults/main.yml @@ -36,7 +36,6 @@ ironic_public_address: "{{ kolla_external_address }}" ironic_admin_address: "{{ kolla_internal_address }}" ironic_internal_address: "{{ kolla_internal_address }}" -ironic_logging_verbose: "{{ openstack_logging_verbose }}" ironic_logging_debug: "{{ openstack_logging_debug }}" openstack_ironic_auth: "{'auth_url':'{{ openstack_auth_v2.auth_url }}','username':'{{ openstack_auth_v2.username }}','password':'{{ openstack_auth_v2.password }}','project_name':'{{ openstack_auth_v2.project_name }}'}" diff --git a/ansible/roles/keystone/defaults/main.yml b/ansible/roles/keystone/defaults/main.yml index 2f3b155248..b40add7c96 100644 --- a/ansible/roles/keystone/defaults/main.yml +++ b/ansible/roles/keystone/defaults/main.yml @@ -24,7 +24,6 @@ keystone_public_address: "{{ kolla_external_address }}" keystone_admin_address: "{{ kolla_internal_address }}" keystone_internal_address: "{{ kolla_internal_address }}" -keystone_logging_verbose: "{{ openstack_logging_verbose }}" keystone_logging_debug: "{{ openstack_logging_debug }}" openstack_keystone_auth: "{'auth_url':'{{ openstack_auth_v2.auth_url }}','username':'{{ openstack_auth_v2.username }}','password':'{{ openstack_auth_v2.password }}','project_name':'{{ openstack_auth_v2.project_name }}'}" diff --git a/ansible/roles/magnum/defaults/main.yml b/ansible/roles/magnum/defaults/main.yml index 6d3ec0032d..61dfbbffdf 100644 --- a/ansible/roles/magnum/defaults/main.yml +++ b/ansible/roles/magnum/defaults/main.yml @@ -27,7 +27,6 @@ magnum_public_address: "{{ kolla_external_address }}" magnum_admin_address: "{{ kolla_internal_address }}" magnum_internal_address: "{{ kolla_internal_address }}" -magnum_logging_verbose: "{{ openstack_logging_verbose }}" magnum_logging_debug: "{{ openstack_logging_debug }}" magnum_keystone_user: "magnum" diff --git a/ansible/roles/mistral/defaults/main.yml b/ansible/roles/mistral/defaults/main.yml index 8de4c38a27..2698339458 100644 --- a/ansible/roles/mistral/defaults/main.yml +++ b/ansible/roles/mistral/defaults/main.yml @@ -32,7 +32,6 @@ mistral_public_address: "{{ kolla_external_address }}" mistral_admin_address: "{{ kolla_internal_address }}" mistral_internal_address: "{{ kolla_internal_address }}" -mistral_logging_verbose: "{{ openstack_logging_verbose }}" mistral_logging_debug: "{{ openstack_logging_debug }}" mistral_keystone_user: "mistral" diff --git a/ansible/roles/murano/defaults/main.yml b/ansible/roles/murano/defaults/main.yml index 45ac3dd73a..d336e13084 100644 --- a/ansible/roles/murano/defaults/main.yml +++ b/ansible/roles/murano/defaults/main.yml @@ -28,7 +28,6 @@ murano_public_address: "{{ kolla_external_address }}" murano_admin_address: "{{ kolla_internal_address }}" murano_internal_address: "{{ kolla_internal_address }}" -murano_logging_verbose: "{{ openstack_logging_verbose }}" murano_logging_debug: "{{ openstack_logging_debug }}" murano_keystone_user: "murano" diff --git a/ansible/roles/neutron/defaults/main.yml b/ansible/roles/neutron/defaults/main.yml index 9bb9939f25..ee58eb09af 100644 --- a/ansible/roles/neutron/defaults/main.yml +++ b/ansible/roles/neutron/defaults/main.yml @@ -44,7 +44,6 @@ neutron_public_address: "{{ kolla_external_address }}" neutron_admin_address: "{{ kolla_internal_address }}" neutron_internal_address: "{{ kolla_internal_address }}" -neutron_logging_verbose: "{{ openstack_logging_verbose }}" neutron_logging_debug: "{{ openstack_logging_debug }}" neutron_keystone_user: "neutron" diff --git a/ansible/roles/nova/defaults/main.yml b/ansible/roles/nova/defaults/main.yml index 635224ed39..9d1f0194b0 100644 --- a/ansible/roles/nova/defaults/main.yml +++ b/ansible/roles/nova/defaults/main.yml @@ -68,7 +68,6 @@ nova_public_address: "{{ kolla_external_address }}" nova_admin_address: "{{ kolla_internal_address }}" nova_internal_address: "{{ kolla_internal_address }}" -nova_logging_verbose: "{{ openstack_logging_verbose }}" nova_logging_debug: "{{ openstack_logging_debug }}" nova_keystone_user: "nova" diff --git a/ansible/roles/swift/defaults/main.yml b/ansible/roles/swift/defaults/main.yml index 5e36ac132d..18ff2ff331 100644 --- a/ansible/roles/swift/defaults/main.yml +++ b/ansible/roles/swift/defaults/main.yml @@ -71,7 +71,6 @@ swift_public_address: "{{ kolla_external_address }}" swift_admin_address: "{{ kolla_internal_address }}" swift_internal_address: "{{ kolla_internal_address }}" -swift_logging_verbose: "{{ openstack_logging_verbose }}" swift_logging_debug: "{{ openstack_logging_debug }}" swift_keystone_user: "swift" diff --git a/etc/kolla/globals.yml b/etc/kolla/globals.yml index a1548eaa05..6ef50d4be7 100644 --- a/etc/kolla/globals.yml +++ b/etc/kolla/globals.yml @@ -70,7 +70,6 @@ neutron_external_interface: "eth1" #openstack_release: "1.0.0" # Use these options to set the various log levels across all OpenStack projects -#openstack_logging_verbose: "True" #openstack_logging_debug: "False" # Valid options are [ novnc, spice ]