From: Jenkins <jenkins@review.openstack.org>
Date: Wed, 17 Aug 2016 09:13:45 +0000 (+0000)
Subject: Merge "Remove deprecated net_ip_uri_map output"
X-Git-Tag: opnfv-6.0.0~1755
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=e09985682ff8b604558b9e76d483ae9f132a48f9;p=apex-tripleo-heat-templates.git

Merge "Remove deprecated net_ip_uri_map output"
---

e09985682ff8b604558b9e76d483ae9f132a48f9
diff --cc puppet/compute.yaml
index 176e0216,8de9370f..489421bf
--- a/puppet/compute.yaml
+++ b/puppet/compute.yaml
@@@ -294,14 -392,61 +294,13 @@@ resources
              network:
                mapped_data:
                  net_ip_map: {get_attr: [NetIpMap, net_ip_map]}
-                 net_ip_uri_map: {get_attr: [NetIpMap, net_ip_uri_map]}
              compute:
                mapped_data:
 -                cinder_enable_nfs_backend: {get_input: cinder_enable_nfs_backend}
 -                nova::use_ipv6: {get_input: nova_ipv6}
 -                nova::debug: {get_input: debug}
 -                nova::rabbit_userid: {get_input: rabbit_username}
 -                nova::rabbit_password: {get_input: rabbit_password}
 -                nova::rabbit_use_ssl: {get_input: rabbit_client_use_ssl}
 -                nova::rabbit_port: {get_input: rabbit_client_port}
 -                nova::upgrade_level_compute: {get_input: upgrade_level_nova_compute}
 -                nova_compute_driver: {get_input: nova_compute_driver}
 -                # TODO(emilien): move libvirt & migration parameters in libvirt profile
 -                # used to deploy libvirt/kvm dependencies:
 -                nova::compute::libvirt::services::libvirt_virt_type: {get_input: nova_compute_libvirt_type}
 -                # used to configured nova.conf:
 -                nova::compute::libvirt::libvirt_virt_type: {get_input: nova_compute_libvirt_type}
 -                nova::compute::neutron::libvirt_vif_driver: {get_input: nova_compute_libvirt_vif_driver}
                  nova_api_host: {get_input: nova_api_host}
                  nova::compute::vncproxy_host: {get_input: nova_public_ip}
 -                nova::compute::rbd::ephemeral_storage: {get_input: nova_enable_rbd_backend}
 -                # TUNNELLED mode provides a security enhancement when using shared storage but is not
 -                # supported when not using shared storage.
 -                # See https://bugzilla.redhat.com/show_bug.cgi?id=1301986#c12
 -                # In future versions of QEMU (2.6, mostly), Dan's native encryption
 -                # work will obsolete the need to use TUNNELLED transport mode.
 -                nova::migration::live_migration_tunnelled: {get_input: nova_enable_rbd_backend}
 -                rbd_persistent_storage: {get_input: cinder_enable_rbd_backend}
 -                nova_password: {get_input: nova_password}
                  nova::compute::vncserver_proxyclient_address: {get_input: nova_vnc_proxyclient_address}
 -                nova::vncproxy::common::vncproxy_protocol: {get_input: nova_vncproxy_protocol}
 -                nova::vncproxy::common::vncproxy_host: {get_input: nova_vncproxy_host}
 -                nova::vncproxy::common::vncproxy_port: {get_input: nova_vncproxy_port}
 -                nova::network::neutron::neutron_ovs_bridge: {get_input: nova_ovs_bridge}
 -                nova::network::neutron::security_group_api: {get_input: nova_security_group_api}
 -                ceilometer::debug: {get_input: debug}
 -                ceilometer::rabbit_userid: {get_input: rabbit_username}
 -                ceilometer::rabbit_password: {get_input: rabbit_password}
 -                ceilometer::rabbit_use_ssl: {get_input: rabbit_client_use_ssl}
 -                ceilometer::rabbit_port: {get_input: rabbit_client_port}
 -                ceilometer::telemetry_secret: {get_input: ceilometer_metering_secret}
 -                ceilometer::agent::auth::auth_password: {get_input: ceilometer_password}
 -                ceilometer::agent::auth::auth_url: {get_input: ceilometer_agent_auth_url}
 -                nova::glance_api_servers: {get_input: glance_api_servers}
 -                neutron::debug: {get_input: debug}
 -                neutron::rabbit_password: {get_input: rabbit_password}
 -                neutron::rabbit_user: {get_input: rabbit_username}
 -                neutron::rabbit_use_ssl: {get_input: rabbit_client_use_ssl}
 -                neutron::rabbit_port: {get_input: rabbit_client_port}
                  neutron::agents::ml2::ovs::local_ip: {get_input: neutron_local_ip}
  
 -                nova::network::neutron::neutron_password: {get_input: neutron_password}
 -                nova::network::neutron::neutron_url: {get_input: neutron_internal_url}
 -                nova::network::neutron::neutron_auth_url: {get_input: neutron_auth_url}
 -                keystone_public_api_virtual_ip: {get_input: keystone_vip}
 -                admin_password: {get_input: admin_password}
                  tripleo::packages::enable_install: {get_input: enable_package_install}
                  tripleo::packages::enable_upgrade: {get_input: enable_package_upgrade}