Various unimportant changes

README.md

@@ -21,18 +21,18 @@ This Puppet module allows deploying a highly-available installation of OpenStack
 
 Four types of nodes are created for the deployment :
 
-* Endpoint nodes that host load balancers and L2/L3 (Open vSwitch) routing and DHCP services 
-* Controller nodes that hosts API services, databases, message queues, caches, and every 
+* Endpoint nodes that host load balancers and L2/L3 (Open vSwitch) routing and DHCP services
+* Controller nodes that hosts API services, databases, message queues, caches, and every
 * Storage nodes that hosts volumes, image storage, objects using Ceph
 * Compute nodes to run guest operating systems
 
 ## Setup
 
 ### Setup Requirements
-This module assumes nodes running Ubuntu 14.04 (Trusty) with either Puppet Enterprise or Puppet. Puppet must have pluginsync and storeconfigs enabled.
+This module assumes nodes running Ubuntu 14.04 (Trusty) with either Puppet Enterprise or Puppet. Puppet must have pluginsync, trusted_node_data and storeconfigs enabled.
 
 This module depends on Hiera.
- 
+
 ### Beginning with puppet-iaas
 To ensure high availability, three storage nodes, three controller nodes and two endpoint nodes must be deployed, be sure to have eight available servers.
 

examples/common.yaml

@@ -10,10 +10,9 @@ iaas::profile::base::ssh_public_key: ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAgEAo/JkbGO
 iaas::profile::base::ntp_servers: [puppet]
 
 # Endpoints
-iaas::role::endpoint::servers: [endpoint-1, endpoint-2]
-iaas::role::endpoint::main_hostname: 'endpoint-1'
-iaas::role::endpoint::main_address: endpoint-1 # The main address used to access the cluster / the load-balancers ;; should point to the dns round-robin for endpoints
-iaas::role::endpoint::haproxy_port: [8140]
+iaas::role::endpoint::servers: [endpoint-1, endpoint-2] # List of load-balancers
+iaas::role::endpoint::main_hostname: 'endpoint-2'
+iaas::role::endpoint::main_address: endpoint-2 # The main virtual address pointing to the load-balancers
 
 iaas::profile::haproxy::stats_enabled: true
 iaas::profile::haproxy::stats_ports: [1936]
@@ -27,7 +26,7 @@ iaas::profile::database::servers: [controller-1, controller-2, controller-3]
 iaas::profile:database::galera_master: controller-1
 iaas::profile:database::galera_password: test
 
-iaas::mysql::allowed_hosts: ["%"] # Remove % in production env and replace by something like : endpoint-1, endpoint-2
+iaas::mysql::allowed_hosts: ["endpoint-1", "endpoint-2"]
 iaas::mysql::keystone::user: keystone
 iaas::mysql::keystone::password: keystone
 iaas::mysql::glance::user: glance
@@ -44,7 +43,7 @@ iaas::mysql::heat::password: heat
 # Rabbitmq
 iaas::profile::rabbitmq::servers: [controller-1, controller-2, controller-3]
 iaas::profile::rabbitmq::user: openstack
-iaas::profile::rabbitmq::password: iaas
+iaas::profile::rabbitmq::password: openstack
 iaas::profile::rabbitmq::erlang: GWFFDKEXVWEMGMFLSFQX
 
 # Keystone

manifests/profile/base.pp

@@ -8,14 +8,12 @@ class iaas::profile::base (
   sysctl { 'net.ipv4.tcp_keepalive_time': value => '30' }
   sysctl { 'net.ipv4.tcp_keepalive_intvl': value => '15' }
 
-  # Apt repo
+  # Ubuntu repository for OpenStack Juno
   apt::source { 'ubuntu-cloud-archive':
     location => 'http://ubuntu-cloud.archive.canonical.com/ubuntu',
     release => "${::lsbdistcodename}-updates/juno",
     repos => 'main',
     required_packages => 'ubuntu-cloud-keyring',
-  } -> exec { "apt_upgrade":
-    command => "apt-get update && apt-get -y upgrade"
   }
 
   # Locales
@@ -50,10 +48,6 @@ class iaas::profile::base (
       'PermitRootLogin'        => 'yes',
       'Port'                   => [22],
     }
-  } ~>
-  exec { 'sshd_restart':
-    command => '/etc/init.d/ssh restart',
-    returns => [0, 1]
   }
   file { "/root/.ssh":
     ensure => "directory",
@@ -67,9 +61,4 @@ class iaas::profile::base (
     mode => 644,
     content => $ssh_public_key
   }
-
-  # Puppet
-  service { "puppet":
-    ensure => "running",
-  }
 }

manifests/profile/rabbitmq.pp

@@ -36,7 +36,7 @@ class iaas::profile::rabbitmq (
   exec { 'rabbitmq_ha_queues':
     command => "rabbitmqctl set_policy ha-all \"^.*\" \'{\"ha-mode\":\"all\"}\'",
     unless => "rabbitmqctl list_policies | grep ha-all"
-  } # -> Anchor<| title == 'nova-start' |> ->
+  }
 
   @@haproxy::balancermember { "rabbitmq_${::fqdn}":
     listening_service => 'rabbitmq',