Merge "Make turning debug on globally easy."
authorJenkins <jenkins@review.openstack.org>
Tue, 2 Sep 2014 21:53:16 +0000 (21:53 +0000)
committerGerrit Code Review <review@openstack.org>
Tue, 2 Sep 2014 21:53:16 +0000 (21:53 +0000)
1  2 
nova-compute-config.yaml
overcloud-source.yaml
undercloud-source.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}
Simple merge
@@@ -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: