diff --git a/doc/source/running-your-own.rst b/doc/source/running-your-own.rst index 7a308a5393..e89b550c49 100644 --- a/doc/source/running-your-own.rst +++ b/doc/source/running-your-own.rst @@ -50,7 +50,7 @@ site.pp This file lists the specific servers you are running. Minimally you need a ci-puppetmaster, gerrit (review), jenkins (secure jobs such as making -releases), jenkins01 (untrusted jobs from any code author), puppet-dashboard, +releases), jenkins01 (untrusted jobs from any code author), puppetboard, nodepool, zuul, and then one or more slaves with appropriate distro choices. A minimal site.pp can be useful to start with to get up and running. E.g. @@ -95,7 +95,7 @@ The minimum set of things to port across is: * The ci-puppetmaster definition in site.pp -* The puppet-dashboard definition in site.pp +* The puppetdb definition in site.pp Then follow the puppet.rsh instructions for bringing up a puppetmaster, replacing openstack_project with your project name. You'll need to populate @@ -103,8 +103,6 @@ hiera at the end with the minimum set of keys: * sysadmins -* dashboard_password and dashboard_mysql_password - Copy in your cloud credentials to /root/ci-launch - e.g. to ``$projectname-rs.sh`` for a rackspace cloud. @@ -113,10 +111,10 @@ Stage 2 Migrate: -* modules/openstack_project/manifests/dashboard.pp +* modules/openstack_project/manifests/puppetdb.pp -Then start up your puppet dashboard (see :file:`launch/README` for full -details):: +Then start up your puppet db with puppet board (see :file:`launch/README` +for full details):: sudo su - cd /opt/config/production/launch diff --git a/install_modules.sh b/install_modules.sh index 4d57e71286..66fe06b8dc 100755 --- a/install_modules.sh +++ b/install_modules.sh @@ -28,8 +28,6 @@ remove_module "limits" # remove saz-limits (required by saz-gearman) MODULES["puppetlabs-ntp"]="0.2.0" -MODULES["openstackci-dashboard"]="0.0.8" - # freenode #puppet 2012-09-25: # 18:25 < jeblair> i would like to use some code that someone wrote, # but it's important that i understand how the author wants me to use diff --git a/manifests/site.pp b/manifests/site.pp index 22d678c2fa..3b50fa9ff6 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -240,14 +240,6 @@ node 'wiki.openstack.org' { } } -node 'puppet-dashboard.openstack.org' { - class { 'openstack_project::dashboard': - password => hiera('dashboard_password'), - mysql_password => hiera('dashboard_mysql_password'), - sysadmins => hiera('sysadmins'), - } -} - $elasticsearch_nodes = [ 'elasticsearch01.openstack.org', 'elasticsearch02.openstack.org', diff --git a/modules/openstack_project/manifests/dashboard.pp b/modules/openstack_project/manifests/dashboard.pp deleted file mode 100644 index e08fcd4c1c..0000000000 --- a/modules/openstack_project/manifests/dashboard.pp +++ /dev/null @@ -1,33 +0,0 @@ -class openstack_project::dashboard( - $password = '', - $mysql_password = '', - $sysadmins = [] -) { - - class { 'openstack_project::server': - iptables_public_tcp_ports => [80, 443, 3000], - sysadmins => $sysadmins - } - - class { '::dashboard': - dashboard_ensure => 'present', - dashboard_user => 'www-data', - dashboard_group => 'www-data', - dashboard_password => $password, - dashboard_db => 'dashboard_prod', - dashboard_charset => 'utf8', - dashboard_site => $::fqdn, - dashboard_port => '3000', - mysql_root_pw => $mysql_password, - passenger => true, - } - - file { '/etc/mysql/conf.d/mysqld_innodb_fpt.cnf': - ensure => present, - source => - 'puppet:///modules/openstack_project/dashboard/mysqld_innodb_fpt.cnf', - require => Class['mysql::server'], - } -} - -# vim:sw=2:ts=2:expandtab:textwidth=79