Merge "Move neutron settings out of puppet/compute.yaml"

2 files changed, 0 insertions, 54 deletions

diff --git a/overcloud.yaml b/overcloud.yaml
index 3a047228..dd857c89 100644
--- a/overcloud.yaml
+++ b/overcloud.yaml
@@ -418,9 +418,6 @@ resources:
         type: OS::TripleO::Compute
         properties:
           CloudDomain: {get_param: CloudDomain}
-          GlanceHost: {get_attr: [VipMap, net_ip_map, {get_attr: [ServiceNetMap, service_net_map, GlanceApiNetwork]}]}
-          KeystoneAdminApiVirtualIP: {get_attr: [VipMap, net_ip_map, {get_attr: [ServiceNetMap, service_net_map, KeystoneAdminApiNetwork]}]}
-          KeystonePublicApiVirtualIP: {get_attr: [VipMap, net_ip_map, {get_attr: [ServiceNetMap, service_net_map, KeystonePublicApiNetwork]}]}
           NeutronPhysicalBridge: {get_param: HypervisorNeutronPhysicalBridge}
           NeutronPublicInterface: {get_param: HypervisorNeutronPublicInterface}
           # L3 HA and Failover is not relevant for Computes, should be removed
diff --git a/puppet/compute.yaml b/puppet/compute.yaml
index a41b6075..e257579d 100644
--- a/puppet/compute.yaml
+++ b/puppet/compute.yaml
@@ -4,14 +4,6 @@ description: >
   OpenStack hypervisor node configured via Puppet.
 
 parameters:
-  AdminPassword:
-    description: The password for the keystone admin account, used for monitoring, querying neutron etc.
-    type: string
-    hidden: true
-  Debug:
-    default: ''
-    description: Set to True to enable debugging on all services.
-    type: string
   ExtraConfig:
     default: {}
     description: |
@@ -24,9 +16,6 @@ parameters:
     type: string
     constraints:
       - custom_constraint: nova.flavor
-  GlanceHost:
-    type: string
-    default: ''  # Has to be here because of the ignored empty value bug
   NovaImage:
     type: string
     default: overcloud-full
@@ -42,12 +31,6 @@ parameters:
     default: default
     constraints:
       - custom_constraint: nova.keypair
-  KeystoneAdminApiVirtualIP:
-    type: string
-    default: ''
-  KeystonePublicApiVirtualIP:
-     type: string
-     default: ''
   NeutronPhysicalBridge:
     default: 'br-ex'
     description: An OVS bridge to create for accessing external networks.
@@ -74,24 +57,6 @@ parameters:
   NovaPublicIP:
     type: string
     default: ''  # Has to be here because of the ignored empty value bug
-  RabbitPassword:
-    description: The password for RabbitMQ
-    type: string
-    hidden: true
-  RabbitUserName:
-    default: guest
-    description: The username for RabbitMQ
-    type: string
-  RabbitClientUseSSL:
-    default: false
-    description: >
-        Rabbit client subscriber parameter to specify
-        an SSL connection to the RabbitMQ host.
-    type: string
-  RabbitClientPort:
-    default: 5672
-    description: Set rabbit subscriber port, change this if using SSL
-    type: number
   EnablePackageInstall:
     default: 'false'
     description: Set to true to enable package installation via Puppet
@@ -336,15 +301,8 @@ resources:
                 nova_api_host: {get_input: nova_api_host}
                 nova::compute::vncproxy_host: {get_input: nova_public_ip}
                 nova::compute::vncserver_proxyclient_address: {get_input: nova_vnc_proxyclient_address}
-                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}
 
-                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}
 
@@ -356,19 +314,10 @@ resources:
       config: {get_resource: NovaComputeConfig}
       server: {get_resource: NovaCompute}
       input_values:
-        debug: {get_param: Debug}
         nova_public_ip: {get_param: NovaPublicIP}
         nova_api_host: {get_param: NovaApiHost}
         nova_vnc_proxyclient_address: {get_attr: [NetIpMap, net_ip_map, {get_param: [ServiceNetMap, NovaVncProxyNetwork]}]}
         neutron_local_ip: {get_attr: [NetIpMap, net_ip_map, {get_param: [ServiceNetMap, NeutronTenantNetwork]}]}
-        neutron_internal_url: {get_param: [EndpointMap, NeutronInternal, uri]}
-        neutron_auth_url: {get_param: [EndpointMap, KeystoneV3Admin, uri]}
-        keystone_vip: {get_param: KeystonePublicApiVirtualIP}
-        admin_password: {get_param: AdminPassword}
-        rabbit_username: {get_param: RabbitUserName}
-        rabbit_password: {get_param: RabbitPassword}
-        rabbit_client_use_ssl: {get_param: RabbitClientUseSSL}
-        rabbit_client_port: {get_param: RabbitClientPort}
         enable_package_install: {get_param: EnablePackageInstall}
         enable_package_upgrade: {get_attr: [UpdateDeployment, update_managed_packages]}