Simplified IP configuration

examples/nodes/controller-1.iaas.yaml

 # Node
 iaas::profile::base::ipaddress: 192.168.3.1
-
-# Keystone
-iaas::profile::keystone::public_ipaddress: 192.168.3.1
-iaas::profile::keystone::admin_ipaddress: 192.168.3.1
-
-# Glance
-iaas::profile::glance::public_ipaddress: 192.168.3.1
-iaas::profile::glance::admin_ipaddress: 192.168.3.1
-
-# Cinder
-iaas::profile::cinder::public_ipaddress: 192.168.3.1
-iaas::profile::cinder::admin_ipaddress: 192.168.3.1
-iaas::profile::cinder::secret: AQC5UtJUIJ4UMhAASaCGxC6d4wWhDW0GT6/IOA==
-
-# Neutron
-iaas::profile::neutron::server::public_ipaddress: 192.168.3.1
-iaas::profile::neutron::server::admin_ipaddress: 192.168.3.1
+iaas::public_ipaddress: 192.168.3.1 #TODO Manage the creation of vnic in base profile to make possible the use of different IPs with only one network card
+iaas::admin_ipaddress: 192.168.3.1
 
 # Ceph keys
 ceph::keys::args:
@@ -34,15 +19,3 @@ ceph::keys::args:
     user: cinder
     group: cinder
     mode: '0550'
-
-# Nova
-iaas::profile::nova::controller::public_ipaddress: 192.168.3.1
-iaas::profile::nova::controller::admin_ipaddress: 192.168.3.1
-
-# Heat
-iaas::profile::heat::public_ipaddress: 192.168.3.1
-iaas::profile::heat::admin_ipaddress: 192.168.3.1
-
-# Horizon
-iaas::profile::horizon::public_ipaddress: 192.168.3.1
-iaas::profile::horizon::admin_ipaddress: 192.168.3.1

examples/nodes/controller-2.iaas.yaml

 # Node
 iaas::profile::base::ipaddress: 192.168.3.2
-
-# Keystone
-iaas::profile::keystone::public_ipaddress: 192.168.3.2
-iaas::profile::keystone::admin_ipaddress: 192.168.3.2
-
-# Glance
-iaas::profile::glance::public_ipaddress: 192.168.3.2
-iaas::profile::glance::admin_ipaddress: 192.168.3.2
-
-# Cinder
-iaas::profile::cinder::public_ipaddress: 192.168.3.2
-iaas::profile::cinder::admin_ipaddress: 192.168.3.2
-iaas::profile::cinder::secret: AQC5UtJUIJ4UMhAASaCGxC6d4wWhDW0GT6/IOA==
-
-# Neutron
-iaas::profile::neutron::server::public_ipaddress: 192.168.3.2
-iaas::profile::neutron::server::admin_ipaddress: 192.168.3.2
+iaas::public_ipaddress: 192.168.3.2 #TODO Manage the creation of vnic in base profile to make possible the use of different IPs with only one network card
+iaas::admin_ipaddress: 192.168.3.2
 
 # Ceph keys
 ceph::keys::args:
@@ -34,15 +19,3 @@ ceph::keys::args:
     user: cinder
     group: cinder
     mode: '0550'
-
-# Nova
-iaas::profile::nova::controller::public_ipaddress: 192.168.3.2
-iaas::profile::nova::controller::admin_ipaddress: 192.168.3.2
-
-# Heat
-iaas::profile::heat::public_ipaddress: 192.168.3.2
-iaas::profile::heat::admin_ipaddress: 192.168.3.2
-
-# Horizon
-iaas::profile::horizon::public_ipaddress: 192.168.3.2
-iaas::profile::horizon::admin_ipaddress: 192.168.3.2

examples/nodes/controller-3.iaas.yaml

 # Node
 iaas::profile::base::ipaddress: 192.168.3.3
-
-# Keystone
-iaas::profile::keystone::public_ipaddress: 192.168.3.3
-iaas::profile::keystone::admin_ipaddress: 192.168.3.3
-
-# Glance
-iaas::profile::glance::public_ipaddress: 192.168.3.3
-iaas::profile::glance::admin_ipaddress: 192.168.3.3
-
-# Cinder
-iaas::profile::cinder::public_ipaddress: 192.168.3.3
-iaas::profile::cinder::admin_ipaddress: 192.168.3.3
-iaas::profile::cinder::secret: AQC5UtJUIJ4UMhAASaCGxC6d4wWhDW0GT6/IOA==
-
-# Neutron
-iaas::profile::neutron::server::public_ipaddress: 192.168.3.3
-iaas::profile::neutron::server::admin_ipaddress: 192.168.3.3
+iaas::public_ipaddress: 192.168.3.3 #TODO Manage the creation of vnic in base profile to make possible the use of different IPs with only one network card
+iaas::admin_ipaddress: 192.168.3.3
 
 # Ceph keys
 ceph::keys::args:
@@ -34,15 +19,3 @@ ceph::keys::args:
     user: cinder
     group: cinder
     mode: '0550'
-
-# Nova
-iaas::profile::nova::controller::public_ipaddress: 192.168.3.3
-iaas::profile::nova::controller::admin_ipaddress: 192.168.3.3
-
-# Heat
-iaas::profile::heat::public_ipaddress: 192.168.3.3
-iaas::profile::heat::admin_ipaddress: 192.168.3.3
-
-# Horizon
-iaas::profile::horizon::public_ipaddress: 192.168.3.3
-iaas::profile::horizon::admin_ipaddress: 192.168.3.3

examples/nodes/endpoint-1.iaas.yaml

 # Node
 iaas::profile::base::ipaddress: 192.168.2.1
 
-# Proxy
-iaas::role::endpoint::haproxy_ip: 192.168.2.1

examples/nodes/endpoint-2.iaas.yaml

 # Node
 iaas::profile::base::ipaddress: 192.168.2.2
 
-# Proxy
-iaas::role::endpoint::haproxy_ip: 192.168.2.2

manifests/profile/cinder.pp

 class iaas::profile::cinder (
   $password = undef,
-  $public_ipaddress = undef,
-  $admin_ipaddress = undef,
+  $public_ipaddress = hiera('iaas::public_ipaddress', undef),
+  $admin_ipaddress = hiera('iaas::admin_ipaddress', undef),
   $secret = undef,
   $volume_size = undef,
 

manifests/profile/glance.pp

 class iaas::profile::glance (
   $password = undef,
-  $public_ipaddress = undef,
-  $admin_ipaddress = undef,
+  $public_ipaddress = hiera('iaas::public_ipaddress', undef),
+  $admin_ipaddress = hiera('iaas::admin_ipaddress', undef),
 
   $region = hiera('iaas::region', undef),
   $endpoint = hiera('iaas::role::endpoint::main_address', undef),

manifests/profile/heat.pp

 class iaas::profile::heat (
   $password = undef,
   $encryption_key = undef,
-  $public_ipaddress = undef,
-  $admin_ipaddress = undef,
+  $public_ipaddress = hiera('iaas::public_ipaddress', undef),
+  $admin_ipaddress = hiera('iaas::admin_ipaddress', undef),
 
   $region = hiera('iaas::region', undef),
   $endpoint = hiera('iaas::role::endpoint::main_address', undef),

manifests/profile/horizon.pp

 class iaas::profile::horizon (
   $secret = undef,
-  $public_ipaddress = undef,
-  $admin_ipaddress = undef,
+  $public_ipaddress = hiera('iaas::public_ipaddress', undef),
+  $admin_ipaddress = hiera('iaas::admin_ipaddress', undef),
 
   $endpoint_address = hiera('iaas::role::endpoint::main_address', undef),
   $endpoint_servers = hiera('iaas::role::endpoint::servers', undef),

manifests/profile/keystone.pp

@@ -5,8 +5,8 @@ class iaas::profile::keystone (
   $tenants = undef,
   $users = undef,
 
-  $public_ipaddress = undef,
-  $admin_ipaddress = undef,
+  $public_ipaddress = hiera('iaas::public_ipaddress', undef),
+  $admin_ipaddress = hiera('iaas::admin_ipaddress', undef),
 
   $region = hiera('iaas::region', undef),
 ) {

manifests/profile/neutron/server.pp

 class iaas::profile::neutron::server (
-  $public_ipaddress = undef,
-  $admin_ipaddress = undef,
 
   $data_network_address = undef,
   $core_plugin = undef,
   $service_plugins = undef,
+  $public_ipaddress = hiera('iaas::public_ipaddress'),
+  $admin_ipaddress = hiera('iaas::admin_ipaddress', undef),
 
   $neutron_password = hiera('iaas::profile::neutron::password', undef),
   $nova_password = hiera('iaas::profile::nova::controller::password', undef),

manifests/profile/nova/controller.pp

 class iaas::profile::nova::controller (
   $password = undef,
-  $public_ipaddress = undef,
-  $admin_ipaddress = undef,
+  $public_ipaddress = hiera('iaas::public_ipaddress', undef),
+  $admin_ipaddress = hiera('iaas::admin_ipaddress', undef),
 
   $neutron_secret = hiera('iaas::profile::neutron::secret', undef),
   $neutron_password = hiera('iaas::profile::neutron::password', undef),

manifests/profile/rabbitmq.pp

 class iaas::profile::rabbitmq (
+  $admin_ipaddress = hiera('iaas::admin_ipaddress', undef),
+
   $servers = undef,
   $user = undef,
   $password = undef,