From: Jenkins <jenkins@review.openstack.org>
Date: Tue, 2 Sep 2014 21:53:16 +0000 (+0000)
Subject: Merge "Make turning debug on globally easy."
X-Git-Tag: opnfv-6.0.0~2751
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=a916a8b2f8bf601ad3854d9ec8b2f2bb373104eb;p=apex-tripleo-heat-templates.git

Merge "Make turning debug on globally easy."
---

a916a8b2f8bf601ad3854d9ec8b2f2bb373104eb
diff --cc nova-compute-config.yaml
index 90387d79,6eac4936..48cfcf81
--- a/nova-compute-config.yaml
+++ b/nova-compute-config.yaml
@@@ -8,8 -8,8 +8,9 @@@ resources
            compute_driver: { get_input: nova_compute_driver }
            compute_libvirt_type: { get_input: nova_compute_libvirt_type }
            db: {get_input: nova_dsn}
+           debug: {get_param: Debug}
            host: {get_input: nova_api_host}
 +          public_ip: {get_input: nova_public_ip}
            service-password: {get_input: nova_password}
          ceilometer:
            db: {get_input: ceilometer_dsn}
diff --cc undercloud-source.yaml
index 369bd3fd,22a681c8..0788e8b6
--- a/undercloud-source.yaml
+++ b/undercloud-source.yaml
@@@ -291,8 -278,8 +299,9 @@@ resources
            signing_certificate: {get_param: KeystoneSigningCertificate}
          mysql:
            innodb_buffer_pool_size: {get_param: MysqlInnodbBufferPoolSize}
 +          root-password: {get_resource: MysqlRootPassword}
          neutron:
+           debug: {get_param: Debug}
            host: 127.0.0.1
            ovs_db: mysql://neutron:unset@localhost/ovs_neutron?charset=utf8
            ovs: