stackforge/packstack-vagrant
Code Issues Proposed changes

Move shared services to the controller node

Browse Source 
Change-Id: I88366ae837499e9595e270a1412f61bf66ab6f12
This commit is contained in:
Christian Berendt
2014-12-13 00:06:09 +01:00
parent 588c4a815b
commit e845221e45
6 changed files with 5 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Vagrantfile vendored
View File

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

1
config.yaml.sample
View File

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

12
contrib/config.ssh
View File

@@ -29,15 +29,3 @@ Host storage
Port 22 Port 22
User vagrant User vagrant
IdentityFile ~/.ssh/id_rsa.packstack 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

1
doc/source/configuration.rst
View File

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

2
files/hosts.j2
View File

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

6
files/packstack.answers.j2
View File

@@ -176,7 +176,7 @@ CONFIG_SATELLITE_PROXY_PW=
CONFIG_AMQP_BACKEND=rabbitmq CONFIG_AMQP_BACKEND=rabbitmq
# The IP address of the server on which to install the AMQP service # 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 # Enable SSL for the AMQP service
CONFIG_AMQP_ENABLE_SSL=n 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 # 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 # 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 # Username for the MariaDB admin user
CONFIG_MARIADB_USER=root CONFIG_MARIADB_USER=root
@@ -667,7 +667,7 @@ CONFIG_CEILOMETER_SECRET=password
CONFIG_CEILOMETER_KS_PW=password CONFIG_CEILOMETER_KS_PW=password
# The IP address of the server on which to install MongoDB # 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 # The password of the nagiosadmin user on the Nagios server
CONFIG_NAGIOS_PW=password CONFIG_NAGIOS_PW=password