openstack/instack-undercloud
Code Issues Proposed changes

Install Horizon via Puppet

Browse Source 
Use the Horizon puppet module instead of the horizon element.

Change-Id: Iac21085a1ad3f3a9e40f660ee0f3934f10b18faa
This commit is contained in:
James Slagle 2015-03-19 07:54:51 -04:00
parent 45e3d84cd4
commit 4191d514d4
7 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
elements/puppet-stack-config/install.d/02-puppet-stack-config
View File

@ -41,6 +41,7 @@ context = {
'UNDERCLOUD_GLANCE_PASSWORD': os.environ.get('UNDERCLOUD_GLANCE_PASSWORD', 'unset'),
'UNDERCLOUD_HEAT_STACK_DOMAIN_ADMIN_PASSWORD': os.environ.get('UNDERCLOUD_HEAT_STACK_DOMAIN_ADMIN_PASSWORD', 'unset'),
'UNDERCLOUD_HEAT_PASSWORD': os.environ.get('UNDERCLOUD_HEAT_PASSWORD', 'unset'),
'UNDERCLOUD_HORIZON_SECRET_KEY': os.environ.get('UNDERCLOUD_HORIZON_SECRET_KEY', 'unset'),
'UNDERCLOUD_NEUTRON_PASSWORD': os.environ.get('UNDERCLOUD_NEUTRON_PASSWORD', 'unset'),
'LOCAL_INTERFACE': os.environ.get('LOCAL_INTERFACE', 'eth1'),
'UNDERCLOUD_CEILOMETER_METERING_SECRET': os.environ.get('UNDERCLOUD_CEILOMETER_METERING_SECRET', 'unset'),

5
elements/puppet-stack-config/puppet-stack-config.pp
View File

@ -299,3 +299,8 @@ ironic_config {
'DEFAULT/my_ip': value => hiera('controller_host');
'glance/host': value => hiera('glance::api::bind_host');
}
class { 'horizon':
secret_key => hiera('horizon_secret_key'),
keystone_url => join(['http://', hiera('controller_host'), ':5000/v2.0']),
}

3
elements/puppet-stack-config/puppet-stack-config.yaml.template
View File

@ -172,6 +172,9 @@ rabbitmq::wipe_db_on_cookie_change: true
rabbit_password: {{UNDERCLOUD_RABBIT_PASSWORD}}
rabbit_username: {{UNDERCLOUD_RABBIT_USERNAME}}
# Horizon
horizon_secret_key: {{UNDERCLOUD_HORIZON_SECRET_KEY}}
# service tenant
ceilometer::api::keystone_tenant: 'service'
cinder::api::keystone_tenant: 'service'

1
elements/undercloud-stack-config/os-apply-config/root/tripleo-undercloud-passwords
View File

@ -8,6 +8,7 @@ UNDERCLOUD_DB_PASSWORD=$(hiera admin_password)
UNDERCLOUD_GLANCE_PASSWORD=$(hiera glance::api::keystone_password)
UNDERCLOUD_HEAT_PASSWORD=$(hiera heat::keystone_password)
UNDERCLOUD_HEAT_STACK_DOMAIN_ADMIN_PASSWORD=$(hiera heat_stack_domain_admin_password)
UNDERCLOUD_HORIZON_SECRET_KEY=$(hiera horizon_secret_key)
UNDERCLOUD_IRONIC_PASSWORD=$(hiera ironic::api::admin_password)
UNDERCLOUD_NEUTRON_PASSWORD=$(hiera neutron::server::auth_password)
UNDERCLOUD_NOVA_PASSWORD=$(hiera nova::api::admin_password)

1
json-files/centos-7-undercloud-packages.json
View File

@ -8,7 +8,6 @@
"redhat-common",
"undercloud-install",
"os-collect-config",
"horizon",
"undercloud-stack-config",
"common-venv",
"undercloud-post-config",

1
json-files/rhel-7-undercloud-packages.json
View File

@ -8,7 +8,6 @@
"redhat-common",
"undercloud-install",
"os-collect-config",
"horizon",
"undercloud-stack-config",
"common-venv",
"undercloud-post-config",

1
scripts/instack-install-undercloud
View File

@ -90,6 +90,7 @@ export UNDERCLOUD_CEILOMETER_SNMPD_PASSWORD=${UNDERCLOUD_CEILOMETER_SNMPD_PASSWO
export UNDERCLOUD_CEILOMETER_SNMPD_USER=${UNDERCLOUD_CEILOMETER_SNMPD_USER:-$(tripleo os-make-password)}
export UNDERCLOUD_GLANCE_PASSWORD=${UNDERCLOUD_GLANCE_PASSWORD:-$(tripleo os-make-password)}
export UNDERCLOUD_HEAT_PASSWORD=${UNDERCLOUD_HEAT_PASSWORD:-$(tripleo os-make-password)}
export UNDERCLOUD_HORIZON_SECRET_KEY=${UNDERCLOUD_HORIZON_SECRET_KEY:-$(tripleo os-make-password)}
export UNDERCLOUD_IRONIC_PASSWORD=${UNDERCLOUD_IRONIC_PASSWORD:-$(tripleo os-make-password)}
export UNDERCLOUD_NEUTRON_PASSWORD=${UNDERCLOUD_NEUTRON_PASSWORD:-$(tripleo os-make-password)}
export UNDERCLOUD_NOVA_PASSWORD=${UNDERCLOUD_NOVA_PASSWORD:-$(tripleo os-make-password)}