Move shared services to the controller node

Change-Id: I88366ae837499e9595e270a1412f61bf66ab6f12

Vagrantfile

@@ -76,7 +76,7 @@ Vagrant.configure(2) do |config|
     end
   end
 
-  %w(network storage shared).each do |name|
+  %w(network storage).each do |name|
     config.vm.define name do |node|
       node.vm.hostname = name
       node.vm.network :public_network,

config.yaml.sample

@@ -15,7 +15,6 @@ storage_backend: nfs
 address:
   controller: 10.100.50.10
   network: 10.100.50.30
-  shared: 10.100.50.50
   storage: 10.100.50.40
   compute: 
   - 10.100.50.20

contrib/config.ssh

@@ -29,15 +29,3 @@ Host storage
     Port 22
     User vagrant
     IdentityFile ~/.ssh/id_rsa.packstack
-
-Host nfs
-    HostName 10.100.50.41
-    Port 22
-    User vagrant
-    IdentityFile ~/.ssh/id_rsa.packstack
-
-Host shared
-    HostName 10.100.50.50
-    Port 22
-    User vagrant
-    IdentityFile ~/.ssh/id_rsa.packstack

doc/source/configuration.rst

@@ -24,7 +24,6 @@ Addresses
     address:
       controller: 10.100.50.10
       network: 10.100.50.30
-      shared: 10.100.50.50
       storage: 10.100.50.40
       compute:
       - 10.100.50.20

files/hosts.j2

@@ -2,7 +2,7 @@
 ::1         localhost localhost.localdomain localhost6 localhost6.localdomain6
 
 # <<< Packstack >>>
-{% for name in ['controller', 'network', 'storage', 'shared'] %}
+{% for name in ['controller', 'network', 'storage'] %}
 {{ address[name] }} {{ name }}
 {% endfor %}
 {% for ip in address['compute'] %}

files/packstack.answers.j2

@@ -176,7 +176,7 @@ CONFIG_SATELLITE_PROXY_PW=
 CONFIG_AMQP_BACKEND=rabbitmq
 
 # The IP address of the server on which to install the AMQP service
-CONFIG_AMQP_HOST={{ address.shared }}
+CONFIG_AMQP_HOST={{ address.controller }}
 
 # Enable SSL for the AMQP service
 CONFIG_AMQP_ENABLE_SSL=n
@@ -209,7 +209,7 @@ CONFIG_AMQP_AUTH_PASSWORD=password
 
 # The IP address of the server on which to install MariaDB or IP
 # address of DB server to use if MariaDB installation was not selected
-CONFIG_MARIADB_HOST={{ address.shared }}
+CONFIG_MARIADB_HOST={{ address.controller }}
 
 # Username for the MariaDB admin user
 CONFIG_MARIADB_USER=root
@@ -667,7 +667,7 @@ CONFIG_CEILOMETER_SECRET=password
 CONFIG_CEILOMETER_KS_PW=password
 
 # The IP address of the server on which to install MongoDB
-CONFIG_MONGODB_HOST={{ address.shared }}
+CONFIG_MONGODB_HOST={{ address.controller }}
 
 # The password of the nagiosadmin user on the Nagios server
 CONFIG_NAGIOS_PW=password