From: Jenkins <jenkins@review.openstack.org>
Date: Wed, 2 Dec 2015 14:40:12 +0000 (+0000)
Subject: Merge "Added libvirt_vif_driver, ovs_bridge and security_group_api parameters"
X-Git-Tag: opnfv-6.0.0~2278
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=263ba3386f2f6446f5d65eb8ce21e46e657b4e94;p=apex-tripleo-heat-templates.git

Merge "Added libvirt_vif_driver, ovs_bridge and security_group_api parameters"
---

263ba3386f2f6446f5d65eb8ce21e46e657b4e94
diff --cc overcloud-without-mergepy.yaml
index 10d1f278,1980425d..67c91a4b
--- a/overcloud-without-mergepy.yaml
+++ b/overcloud-without-mergepy.yaml
@@@ -956,9 -919,12 +968,12 @@@ resources
            NovaComputeDriver: {get_param: NovaComputeDriver}
            NovaComputeExtraConfig: {get_param: NovaComputeExtraConfig}
            NovaComputeLibvirtType: {get_param: NovaComputeLibvirtType}
+           NovaComputeLibvirtVifDriver: {get_param: NovaComputeLibvirtVifDriver}
            NovaEnableRbdBackend: {get_param: NovaEnableRbdBackend}
 -          NovaPublicIP: {get_attr: [PublicVirtualIP, ip_address]}
 +          NovaPublicIP: {get_attr: [VipMap, net_ip_map, external]}
            NovaPassword: {get_param: NovaPassword}
+           NovaOVSBridge: {get_param: NovaOVSBridge}
+           NovaSecurityGroupAPI: {get_param: NovaSecurityGroupAPI}
            NtpServer: {get_param: NtpServer}
            RabbitHost: {get_attr: [VipMap, net_ip_map, {get_param: [ServiceNetMap, RabbitMqNetwork]}]}
            RabbitPassword: {get_param: RabbitPassword}
diff --cc puppet/compute.yaml
index 8d40a4ff,c25a6297..199eeeab
--- a/puppet/compute.yaml
+++ b/puppet/compute.yaml
@@@ -215,10 -217,17 +219,18 @@@ parameters
    NovaPublicIP:
      type: string
      default: ''  # Has to be here because of the ignored empty value bug
+   NovaOVSBridge:
+     default: 'br-int'
+     description: Name of integration bridge used by Open vSwitch
+     type: string
+   NovaSecurityGroupAPI:
+     default: 'neutron'
+     description: The full class name of the security API class
+     type: string
    NtpServer:
 -    type: string
      default: ''
 +    description: Comma-separated list of ntp servers
 +    type: comma_delimited_list
    RabbitHost:
      type: string
      default: ''  # Has to be here because of the ignored empty value bug
@@@ -399,9 -397,10 +412,11 @@@ resources
                  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}
 +                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::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}
@@@ -464,8 -463,9 +480,10 @@@
          nova_api_host: {get_param: NovaApiHost}
          nova_password: {get_param: NovaPassword}
          nova_enable_rbd_backend: {get_param: NovaEnableRbdBackend}
 +        cinder_enable_rbd_backend: {get_param: CinderEnableRbdBackend}
          nova_vnc_proxyclient_address: {get_attr: [NetIpMap, net_ip_map, {get_param: [ServiceNetMap, NovaVncProxyNetwork]}]}
+         nova_ovs_bridge: {get_param: NovaOVSBridge}
+         nova_security_group_api: {get_param: NovaSecurityGroupAPI}
          ceilometer_metering_secret: {get_param: CeilometerMeteringSecret}
          ceilometer_password: {get_param: CeilometerPassword}
          ceilometer_compute_agent: {get_param: CeilometerComputeAgent}