Skip to content

Commit

Permalink
SM-KILO: fixed kilo horizon
Browse files Browse the repository at this point in the history
Closes-Bug: #1527720

CHANGES:
1. removed installation of horizon via puppet-horizon
2. syncd local_settings.py with that of FAB.
3. removed call to mpm_event disable.

TESTING:
provisioned juno/kilo and verified following cases:

1. provisioned 1 all-in-one node, verified that provision is completed
2. added image, created a network, subnetwork and 2 VMs, verified VMs are
active.
3. Logged-in to horizon and browsed to verify web-ui is up and Running.
4. created a new network/subnet using horizon, launched a new instance of
cirros image.
5. VMs are able to ping each other.
6. VM is able get http://169.254.269.254/openstack (metadata service)

Change-Id: I79ff2fe901a0de4d024c080e8f771c3962b80992
  • Loading branch information
Dheeraj Gautam committed Jan 21, 2016
1 parent 6c91609 commit a463267
Show file tree
Hide file tree
Showing 3 changed files with 672 additions and 3 deletions.
Expand Up @@ -115,7 +115,7 @@
}
create_resources(nova_config,$nova_params, {} )

include ::contrail::exec_disable_mpm_event
#include ::contrail::exec_disable_mpm_event

if ($enable_ceilometer) {
# Set instance_usage_audit_period to hour
Expand Down
Expand Up @@ -31,7 +31,7 @@
class {'::openstack::profile::cinder::api' : } ->
class {'::openstack::profile::nova::api' : } ->
class {'::contrail::profile::openstack::heat' : } ->
class {'::openstack::profile::horizon' : } ->
#class {'::openstack::profile::horizon' : } ->
class {'::openstack::profile::auth_file' : } ->
class {'::openstack::profile::provision' : } ->
class {'::contrail::contrail_openstack' : } ->
Expand All @@ -40,7 +40,13 @@
openstack::resources::database { 'neutron': }
->
package { 'neutron-server': ensure => present }

-> package { 'openstack-dashboard': ensure => present }
-> file {'/etc/openstack-dashboard/local_settings.py':
ensure => present,
mode => '0755',
group => root,
content => template("${module_name}/local_settings.py.erb")
}
if ($package_sku != 'kilo') {
package { 'contrail-openstack-dashboard':
ensure => latest,
Expand Down

0 comments on commit a463267

Please sign in to comment.