diff --git a/README.md b/README.md index 49211681..1df06860 100644 --- a/README.md +++ b/README.md @@ -246,7 +246,7 @@ License and Author | **Copyright** | Copyright (c) 2013, Opscode, Inc. | | **Copyright** | Copyright (c) 2013, Craig Tracey | | **Copyright** | Copyright (c) 2013-2014, SUSE Linux GmbH | -| **Copyright** | Copyright (c) 2013-2014, IBM, Corp. | +| **Copyright** | Copyright (c) 2013-2015, IBM, Corp. | | **Copyright** | Copyright (c) 2013-2014, Rackspace US, Inc. | Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/attributes/default.rb b/attributes/default.rb index 69a727be..33aa0807 100644 --- a/attributes/default.rb +++ b/attributes/default.rb @@ -462,6 +462,20 @@ default['openstack']['endpoints']['bare-metal-api']['port'] = '6385' default['openstack']['endpoints']['bare-metal-api']['path'] = '' default['openstack']['endpoints']['bare-metal-api']['bind_interface'] = nil +# ****************** OpenStack Dashboard Endpoints ****************************** + +# The OpenStack Dashboard non-SSL endpoint +default['openstack']['endpoints']['dashboard-http-bind']['host'] = node['openstack']['endpoints']['bind-host'] +default['openstack']['endpoints']['dashboard-http-bind']['port'] = '80' +default['openstack']['endpoints']['dashboard-http-bind']['bind_interface'] = node['openstack']['endpoints']['bind_interface'] + +# The OpenStack Dashboard SSL endpoint +default['openstack']['endpoints']['dashboard-https-bind']['host'] = node['openstack']['endpoints']['bind-host'] +default['openstack']['endpoints']['dashboard-https-bind']['port'] = '443' +default['openstack']['endpoints']['dashboard-https-bind']['bind_interface'] = node['openstack']['endpoints']['bind_interface'] + +# ******************************************************************************** + # Alternately, if you used some standardized DNS naming scheme, you could # do something like this, which would override any part-wise specifications above. # diff --git a/metadata.rb b/metadata.rb index d01b03fb..31fe1261 100644 --- a/metadata.rb +++ b/metadata.rb @@ -4,7 +4,7 @@ maintainer_email 'opscode-chef-openstack@googlegroups.com' license 'Apache 2.0' description 'Common OpenStack attributes, libraries and recipes.' long_description IO.read(File.join(File.dirname(__FILE__), 'README.md')) -version '11.0.0' +version '11.1.0' recipe 'openstack-common', 'Installs/Configures common recipes' recipe 'openstack-common::set_endpoints_by_interface', 'Set endpoints by interface' diff --git a/spec/default_spec.rb b/spec/default_spec.rb index 371d8c7b..ef355f59 100644 --- a/spec/default_spec.rb +++ b/spec/default_spec.rb @@ -61,7 +61,7 @@ describe 'openstack-common::default' do compute-xvpvnc-bind compute-novnc-bind compute-vnc-bind compute-vnc-proxy-bind compute-metadata-api-bind network-api-bind image-api-bind image-registry-bind block-storage-api-bind object-storage-api-bind telemetry-api-bind orchestration-api-bind orchestration-api-cfn-bind orchestration-api-cloudwatch-bind - database-api-bind bare-metal-api-bind}.each do |endpoint| + database-api-bind bare-metal-api-bind dashboard-http-bind dashboard-https-bind}.each do |endpoint| expect(chef_run.node['openstack']['endpoints'][endpoint]['bind_interface']).to eq('eth1') end end