BZ #1053729 - Foreman controller params should end with _host instead…

… of _ip. https://bugzilla.redhat.com/show_bug.cgi?id=1053729 Rename controller_pub_ip and controller_priv_ip Foreman Host Group parameters to more agnostic controller_pub_host or controller_priv_host-- more agnostic because the user may enter a hostname or an IP address for those values. (cherry picked from commit de43230)
larsks · Jan 15, 2014 · 46fb5a1 · 46fb5a1
1 parent 28e7060
commit 46fb5a1
Show file tree

Hide file tree

Showing 15 changed files with 94 additions and 94 deletions.
diff --git a/bin/seeds.rb b/bin/seeds.rb
@@ -265,8 +265,8 @@
  "swift_ring_server" => '172.16.0.1',
  "fixed_network_range" => '10.0.0.0/24',
  "floating_network_range" => '10.0.1.0/24',
- "controller_priv_ip"  => '172.16.0.1',
- "controller_pub_ip"  => '172.16.1.1',
+ "controller_priv_host" => '172.16.0.1',
+ "controller_pub_host" => '172.16.1.1',
  "mysql_host" => '172.16.0.1',
  "mysql_virtual_ip" => '192.168.200.220',
  "mysql_bind_address" => '0.0.0.0',

diff --git a/puppet/modules/quickstack/manifests/ceilometer_controller.pp b/puppet/modules/quickstack/manifests/ceilometer_controller.pp
@@ -1,17 +1,17 @@
 class quickstack::ceilometer_controller(
  $ceilometer_metering_secret,
  $ceilometer_user_password,
- $controller_priv_ip,
- $controller_pub_ip,
+ $controller_priv_host,
+ $controller_pub_host,
  $qpid_host,
  $verbose,
 ) {
 
  class { 'ceilometer::keystone::auth':
  password => $ceilometer_user_password,
- public_address => $controller_pub_ip,
- admin_address => $controller_priv_ip,
- internal_address => $controller_priv_ip,
+ public_address => $controller_pub_host,
+ admin_address => $controller_priv_host,
+ internal_address => $controller_priv_host,
  }
 
  class { 'mongodb':
@@ -38,7 +38,7 @@
  }
 
  class { 'ceilometer::agent::auth':
- auth_url => "http:https://${controller_priv_ip}:35357/v2.0",
+ auth_url => "http:https://${controller_priv_host}:35357/v2.0",
  auth_password => $ceilometer_user_password,
  }
 
@@ -47,7 +47,7 @@
  }
 
  class { 'ceilometer::api':
- keystone_host => $controller_priv_ip,
+ keystone_host => $controller_priv_host,
  keystone_password => $ceilometer_user_password,
  require => Class['mongodb'],
  }

diff --git a/puppet/modules/quickstack/manifests/cinder_controller.pp b/puppet/modules/quickstack/manifests/cinder_controller.pp
@@ -5,14 +5,14 @@
  $cinder_gluster_volume = $quickstack::params::cinder_gluster_volume,
  $cinder_gluster_servers = $quickstack::params::cinder_gluster_servers,
  $cinder_user_password = $quickstack::params::cinder_user_password,
- $controller_priv_ip  = $quickstack::params::controller_priv_ip,
+ $controller_priv_host = $quickstack::params::controller_priv_host,
  $mysql_host = $quickstack::params::mysql_host,
  $qpid_host = $quickstack::params::qpid_host,
  $verbose = $quickstack::params::verbose,
 ) inherits quickstack::params {
 
  cinder_config {
- 'DEFAULT/glance_host': value => $controller_priv_ip;
+ 'DEFAULT/glance_host': value => $controller_priv_host;
  'DEFAULT/notification_driver': value => 'cinder.openstack.common.notifier.rpc_notifier'
  }
 
@@ -29,7 +29,7 @@
  keystone_password => $cinder_user_password,
  keystone_tenant => "services",
  keystone_user => "cinder",
- keystone_auth_host => $controller_priv_ip,
+ keystone_auth_host => $controller_priv_host,
  }
 
  class {'cinder::scheduler': }

diff --git a/puppet/modules/quickstack/manifests/compute_common.pp b/puppet/modules/quickstack/manifests/compute_common.pp
@@ -4,8 +4,8 @@
  $ceilometer_metering_secret = $quickstack::params::ceilometer_metering_secret,
  $ceilometer_user_password = $quickstack::params::ceilometer_user_password,
  $cinder_backend_gluster = $quickstack::params::cinder_backend_gluster,
- $controller_priv_ip  = $quickstack::params::controller_priv_ip,
- $controller_pub_ip  = $quickstack::params::controller_pub_ip,
+ $controller_priv_host = $quickstack::params::controller_priv_host,
+ $controller_pub_host = $quickstack::params::controller_pub_host,
  $mysql_host = $quickstack::params::mysql_host,
  $nova_db_password = $quickstack::params::nova_db_password,
  $nova_user_password = $quickstack::params::nova_user_password,
@@ -31,7 +31,7 @@
  class { 'nova':
  sql_connection => "mysql:https://nova:${nova_db_password}@${mysql_host}/nova",
  image_service => 'nova.image.glance.GlanceImageService',
- glance_api_servers => "http:https://${controller_priv_ip}:9292/v1",
+ glance_api_servers => "http:https://${controller_priv_host}:9292/v1",
  rpc_backend => 'nova.openstack.common.rpc.impl_qpid',
  qpid_hostname => $qpid_host,
  verbose => $verbose,
@@ -55,7 +55,7 @@
 
  class { 'nova::compute':
  enabled => true,
- vncproxy_host => $controller_pub_ip,
+ vncproxy_host => $controller_pub_host,
  vncserver_proxyclient_address => $::ipaddress,
  }
 
@@ -67,7 +67,7 @@
  }
 
  class { 'ceilometer::agent::auth':
- auth_url => "http:https://${controller_priv_ip}:35357/v2.0",
+ auth_url => "http:https://${controller_priv_host}:35357/v2.0",
  auth_password => $ceilometer_user_password,
  }
 

diff --git a/puppet/modules/quickstack/manifests/controller_common.pp b/puppet/modules/quickstack/manifests/controller_common.pp
@@ -10,8 +10,8 @@
  $cinder_gluster_servers = $quickstack::params::cinder_gluster_servers,
  $cinder_gluster_volume = $quickstack::params::cinder_gluster_volume,
  $cinder_user_password = $quickstack::params::cinder_user_password,
- $controller_priv_ip  = $quickstack::params::controller_priv_ip,
- $controller_pub_ip  = $quickstack::params::controller_pub_ip,
+ $controller_priv_host = $quickstack::params::controller_priv_host,
+ $controller_pub_host = $quickstack::params::controller_pub_host,
  $glance_db_password = $quickstack::params::glance_db_password,
  $glance_user_password = $quickstack::params::glance_user_password,
  $heat_cfn = $quickstack::params::heat_cfn,
@@ -48,7 +48,7 @@
  mysql_bind_address => '0.0.0.0',
  mysql_account_security => true,
 
- allowed_hosts => ['%',$controller_priv_ip],
+ allowed_hosts => ['%',$controller_priv_host],
  enabled => true,
 
  # Networking
@@ -70,25 +70,25 @@
  cinder_user_password => $cinder_user_password,
  neutron_user_password => $neutron_user_password,
 
- public_address => $controller_pub_ip,
- admin_address => $controller_priv_ip,
- internal_address => $controller_priv_ip,
+ public_address => $controller_pub_host,
+ admin_address => $controller_priv_host,
+ internal_address => $controller_priv_host,
 
- glance_public_address => $controller_pub_ip,
- glance_admin_address => $controller_priv_ip,
- glance_internal_address => $controller_priv_ip,
+ glance_public_address => $controller_pub_host,
+ glance_admin_address => $controller_priv_host,
+ glance_internal_address => $controller_priv_host,
 
- nova_public_address => $controller_pub_ip,
- nova_admin_address => $controller_priv_ip,
- nova_internal_address => $controller_priv_ip,
+ nova_public_address => $controller_pub_host,
+ nova_admin_address => $controller_priv_host,
+ nova_internal_address => $controller_priv_host,
 
- cinder_public_address => $controller_pub_ip,
- cinder_admin_address => $controller_priv_ip,
- cinder_internal_address => $controller_priv_ip,
+ cinder_public_address => $controller_pub_host,
+ cinder_admin_address => $controller_priv_host,
+ cinder_internal_address => $controller_priv_host,
 
- neutron_public_address => $controller_pub_ip,
- neutron_admin_address => $controller_priv_ip,
- neutron_internal_address => $controller_priv_ip,
+ neutron_public_address => $controller_pub_host,
+ neutron_admin_address => $controller_priv_host,
+ neutron_internal_address => $controller_priv_host,
 
  neutron => str2bool("$neutron"),
  enabled => true,
@@ -97,9 +97,9 @@
 
  class { 'swift::keystone::auth':
  password => $swift_admin_password,
- public_address => $controller_pub_ip,
- internal_address => $controller_priv_ip,
- admin_address => $controller_priv_ip,
+ public_address => $controller_pub_host,
+ internal_address => $controller_priv_host,
+ admin_address => $controller_priv_host,
  }
 
  class {'openstack::glance':
@@ -113,7 +113,7 @@
  class { 'nova':
  sql_connection => "mysql:https://nova:${nova_db_password}@${mysql_host}/nova",
  image_service => 'nova.image.glance.GlanceImageService',
- glance_api_servers => "http:https://${controller_priv_ip}:9292/v1",
+ glance_api_servers => "http:https://${controller_priv_host}:9292/v1",
  rpc_backend => 'nova.openstack.common.rpc.impl_qpid',
  verbose => $verbose,
  require => Class['openstack::db::mysql', 'qpid::server'],
@@ -123,14 +123,14 @@
  class { 'nova::api':
  enabled => true,
  admin_password => $nova_user_password,
- auth_host => $controller_priv_ip,
+ auth_host => $controller_priv_host,
  neutron_metadata_proxy_shared_secret => $neutron_metadata_proxy_secret,
  }
  } else {
  class { 'nova::api':
  enabled => true,
  admin_password => $nova_user_password,
- auth_host => $controller_priv_ip,
+ auth_host => $controller_priv_host,
  }
  }
 
@@ -146,14 +146,14 @@
  class { 'quickstack::ceilometer_controller':
  ceilometer_metering_secret => $ceilometer_metering_secret,
  ceilometer_user_password => $ceilometer_user_password,
- controller_priv_ip  => $controller_priv_ip,
- controller_pub_ip  => $controller_pub_ip,
+ controller_priv_host => $controller_priv_host,
+ controller_pub_host => $controller_pub_host,
  qpid_host => $qpid_host,
  verbose => $verbose,
  }
 
  class {'quickstack::swift::proxy':
- controller_pub_ip  => $controller_pub_ip,
+ controller_pub_host => $controller_pub_host,
  swift_admin_password => $swift_admin_password,
  swift_shared_secret => $swift_shared_secret,
  }
@@ -165,7 +165,7 @@
  cinder_gluster_volume => $cinder_gluster_volume,
  cinder_gluster_servers => $cinder_gluster_servers,
  cinder_user_password => $cinder_user_password,
- controller_priv_ip  => $controller_priv_ip,
+ controller_priv_host => $controller_priv_host,
  mysql_host => $mysql_host,
  qpid_host => $qpid_host,
  verbose => $verbose,
@@ -176,8 +176,8 @@
  heat_cloudwatch => $heat_cloudwatch,
  heat_user_password => $heat_user_password,
  heat_db_password => $heat_db_password,
- controller_priv_ip  => $controller_priv_ip,
- controller_pub_ip  => $controller_pub_ip,
+ controller_priv_host => $controller_priv_host,
+ controller_pub_host => $controller_pub_host,
  mysql_host => $mysql_host,
  qpid_host => $qpid_host,
  verbose => $verbose,
@@ -200,7 +200,7 @@
 
  class {'horizon':
  secret_key => $horizon_secret_key,
- keystone_host => $controller_priv_ip,
+ keystone_host => $controller_priv_host,
  }
 
  class {'memcached':}

diff --git a/puppet/modules/quickstack/manifests/heat_controller.pp b/puppet/modules/quickstack/manifests/heat_controller.pp
@@ -3,27 +3,27 @@
  $heat_cloudwatch,
  $heat_user_password,
  $heat_db_password,
- $controller_priv_ip,
- $controller_pub_ip,
+ $controller_priv_host,
+ $controller_pub_host,
  $mysql_host,
  $qpid_host,
  $verbose,
 ) {
 
  class {"heat::keystone::auth":
  password => $heat_user_password,
- heat_public_address => $controller_pub_ip,
- heat_admin_address => $controller_priv_ip,
- heat_internal_address => $controller_priv_ip,
- cfn_public_address => $controller_pub_ip,
- cfn_admin_address => $controller_priv_ip,
- cfn_internal_address => $controller_priv_ip,
+ heat_public_address => $controller_pub_host,
+ heat_admin_address => $controller_priv_host,
+ heat_internal_address => $controller_priv_host,
+ cfn_public_address => $controller_pub_host,
+ cfn_admin_address => $controller_priv_host,
+ cfn_internal_address => $controller_priv_host,
  }
 
  class { 'heat':
- keystone_host => $controller_priv_ip,
+ keystone_host => $controller_priv_host,
  keystone_password => $heat_user_password,
- auth_uri => "http:https://${controller_priv_ip}:35357/v2.0",
+ auth_uri => "http:https://${controller_priv_host}:35357/v2.0",
  rpc_backend => 'heat.openstack.common.rpc.impl_qpid',
  qpid_hostname => $qpid_host,
  verbose => $verbose,
@@ -38,9 +38,9 @@
  }
 
  class { 'heat::engine':
- heat_metadata_server_url => "http:https://${controller_priv_ip}:8000",
- heat_waitcondition_server_url => "http:https://${controller_priv_ip}:8000/v1/waitcondition",
- heat_watch_server_url => "http:https://${controller_priv_ip}:8003",
+ heat_metadata_server_url => "http:https://${controller_priv_host}:8000",
+ heat_waitcondition_server_url => "http:https://${controller_priv_host}:8000/v1/waitcondition",
+ heat_watch_server_url => "http:https://${controller_priv_host}:8003",
  }
 
  class { 'heat::db::mysql':

diff --git a/puppet/modules/quickstack/manifests/neutron/compute.pp b/puppet/modules/quickstack/manifests/neutron/compute.pp
@@ -4,8 +4,8 @@
  $ceilometer_metering_secret = $quickstack::params::ceilometer_metering_secret,
  $ceilometer_user_password = $quickstack::params::ceilometer_user_password,
  $cinder_backend_gluster = $quickstack::params::cinder_backend_gluster,
- $controller_priv_ip  = $quickstack::params::controller_priv_ip,
- $controller_pub_ip  = $quickstack::params::controller_pub_ip,
+ $controller_priv_host = $quickstack::params::controller_priv_host,
+ $controller_pub_host = $quickstack::params::controller_pub_host,
  $enable_tunneling = $quickstack::params::enable_tunneling,
  $mysql_host = $quickstack::params::mysql_host,
  $neutron_core_plugin = $quickstack::params::neutron_core_plugin,
@@ -40,7 +40,7 @@
 
  neutron_config {
  'database/connection': value => "mysql:https://neutron:${neutron_db_password}@${mysql_host}/neutron";
- 'keystone_authtoken/auth_host': value => $controller_priv_ip;
+ 'keystone_authtoken/auth_host': value => $controller_priv_host;
  'keystone_authtoken/admin_tenant_name': value => 'services';
  'keystone_authtoken/admin_user': value => 'neutron';
  'keystone_authtoken/admin_password': value => $neutron_user_password;
@@ -62,8 +62,8 @@
 
  class { '::nova::network::neutron':
  neutron_admin_password => $neutron_user_password,
- neutron_url => "http:https://${controller_priv_ip}:9696",
- neutron_admin_auth_url => "http:https://${controller_priv_ip}:35357/v2.0",
+ neutron_url => "http:https://${controller_priv_host}:9696",
+ neutron_admin_auth_url => "http:https://${controller_priv_host}:35357/v2.0",
  }
 
 
@@ -72,8 +72,8 @@
  ceilometer_metering_secret => $ceilometer_metering_secret,
  ceilometer_user_password => $ceilometer_user_password,
  cinder_backend_gluster => $cinder_backend_gluster,
- controller_priv_ip  => $controller_priv_ip,
- controller_pub_ip  => $controller_pub_ip,
+ controller_priv_host => $controller_priv_host,
+ controller_pub_host => $controller_pub_host,
  mysql_host => $mysql_host,
  nova_db_password => $nova_db_password,
  nova_user_password => $nova_user_password,

diff --git a/puppet/modules/quickstack/manifests/neutron/controller.pp b/puppet/modules/quickstack/manifests/neutron/controller.pp
@@ -12,8 +12,8 @@
  $cinder_user_password = $quickstack::params::cinder_user_password,
  $cisco_nexus_plugin = $quickstack::params::cisco_nexus_plugin,
  $cisco_vswitch_plugin = $quickstack::params::cisco_vswitch_plugin,
- $controller_priv_ip  = $quickstack::params::controller_priv_ip,
- $controller_pub_ip  = $quickstack::params::controller_pub_ip,
+ $controller_priv_host = $quickstack::params::controller_priv_host,
+ $controller_pub_host = $quickstack::params::controller_pub_host,
  $glance_db_password = $quickstack::params::glance_db_password,
  $glance_user_password = $quickstack::params::glance_user_password,
  $heat_cfn = $quickstack::params::heat_cfn,
@@ -56,8 +56,8 @@
  cinder_gluster_servers => $cinder_gluster_servers,
  cinder_gluster_volume => $cinder_gluster_volume,
  cinder_user_password => $cinder_user_password,
- controller_priv_ip  => $controller_priv_ip,
- controller_pub_ip  => $controller_pub_ip,
+ controller_priv_host => $controller_priv_host,
+ controller_pub_host => $controller_pub_host,
  glance_db_password => $glance_db_password,
  glance_user_password => $glance_user_password,
  heat_cfn => $heat_cfn,