diff --git a/deployment_scripts/puppet/modules/openbook/manifests/db/mysql.pp b/deployment_scripts/puppet/modules/openbook/manifests/db/mysql.pp index 9b649f4..842eb5e 100644 --- a/deployment_scripts/puppet/modules/openbook/manifests/db/mysql.pp +++ b/deployment_scripts/puppet/modules/openbook/manifests/db/mysql.pp @@ -49,19 +49,19 @@ class openbook::db::mysql { # require => Package[$openbook::params::db_server_pkg] #} - class { 'mariadbrepo': - version => "$openbook::params::db_version" - } +# class { 'mariadbrepo': +# version => "$openbook::params::db_version" +# } package { "$openbook::params::db_server_pkg" : ensure => present, - require => Class['mariadbrepo'] + #require => Class['mariadbrepo'] } - package { "$openbook::params::db_client_pkg" : - ensure => present, - require => Class['mariadbrepo'] - } +# package { "$openbook::params::db_client_pkg" : +# ensure => present, +# #require => Class['mariadbrepo'] +# } service { 'mysql': ensure => running, diff --git a/deployment_scripts/puppet/modules/openbook/manifests/params.pp b/deployment_scripts/puppet/modules/openbook/manifests/params.pp index 9cd9cb5..e7f2aa6 100644 --- a/deployment_scripts/puppet/modules/openbook/manifests/params.pp +++ b/deployment_scripts/puppet/modules/openbook/manifests/params.pp @@ -36,14 +36,14 @@ class openbook::params { $openbook = hiera_hash('openbook') $jvm_heap = $openbook['jvm_heap_size'] - $sharefile_username = $openbook['sharefile_user'] - $sharefile_password = $openbook['sharefile_pass'] + $sharefile_username = '' #$openbook['sharefile_user'] + $sharefile_password = '' #$openbook['sharefile_pass'] $sharefile_hostname = 'talligent.sharefile.com' $sharefile_client_id = 'eC8y8eeoeunxzOizZq2oeknIVfA9Jyjg' $sharefile_client_secret = 'PehmEqzEgKuGm2XOZWXIOUY3GyrKcfSmNtwPptPwt0tWxihs' $sharefile_download_path = '/tmp/Openbook.zip' - $db_password = 'Tall!g3nt' + $db_password = $openbook['db_password'] $db_version = '10.1' $keystore_pass = 'rG8EE69CC0OuQKW+6pC6LytgRQM7QZUmt5CDySUgupY=' $ipaddress = $::ipaddress @@ -51,7 +51,7 @@ class openbook::params { case $::operatingsystem { 'Ubuntu', 'Debian': { $db_server_pkg = 'mariadb-server' - $db_client_pkg = "mariadb-client-${db_version}" +# $db_client_pkg = "mariadb-client-${db_version}" $app_server_pkg = 'tomcat7' $java_pkg = 'openjdk-8-jdk' diff --git a/deployment_scripts/puppet/modules/openbook/manifests/tomcat/server.pp b/deployment_scripts/puppet/modules/openbook/manifests/tomcat/server.pp index 3443b3d..922e13a 100644 --- a/deployment_scripts/puppet/modules/openbook/manifests/tomcat/server.pp +++ b/deployment_scripts/puppet/modules/openbook/manifests/tomcat/server.pp @@ -44,19 +44,31 @@ class openbook::tomcat::server { content => template('openbook/sharefile_download.py.erb'), } - exec { 'download openbook': - command => '/usr/bin/python /tmp/sharefile_download.py', - unless => '/usr/bin/test -f /tmp/Openbook.war', - require => File['sharefile_download.py'], - timeout => 1200 +# exec { 'download openbook': +# command => '/usr/bin/python /tmp/sharefile_download.py', +# unless => '/usr/bin/test -f /tmp/Openbook.war', +# require => File['sharefile_download.py'], +# timeout => 1200 +# } + + file { 'Openbook.zip': + path => '/tmp/Openbook.zip', + ensure => present, + source => 'puppet:///modules/openbook/Openbook.zip' } exec { 'unzip openbook': command => '/usr/bin/unzip -q /tmp/Openbook.zip -d /tmp/', unless => '/usr/bin/test -d /tmp/Openbook-*', - require => [Exec['download openbook'], Package['unzip']] + require => [File['Openbook.zip'], Package['unzip']] } +# exec { 'unzip openbook': +# command => '/usr/bin/unzip -q /tmp/Openbook.zip -d /tmp/', +# unless => '/usr/bin/test -d /tmp/Openbook-*', +# require => [File['download openbook'], Package['unzip']] +# } + file { 'openbook.properties': path => '/var/lib/tomcat7/webapps/Openbook/WEB-INF/classes/openbook.properties', ensure => present, diff --git a/deployment_tasks.yaml b/deployment_tasks.yaml index fccf2cf..e21248f 100644 --- a/deployment_tasks.yaml +++ b/deployment_tasks.yaml @@ -2,16 +2,24 @@ - id: openbook type: group role: [openbook] - tasks: &common_tasks + tasks: #[hiera, globals, netconfig, hosts, deploy_start] - hiera -# - setup_repositories -# - fuel_pkgs + - setup_repositories + - fuel_pkgs - globals + - tools + - logging - netconfig - hosts # - hiera +## - setup_repositories +## - fuel_pkgs # - globals # - netconfig +# - hosts +## - hiera +## - globals +## - netconfig required_for: [deploy_end] requires: [deploy_start,controller] parameters: @@ -47,7 +55,7 @@ type: puppet groups: ['openbook'] required_for: [deploy_end] - requires: [deploy_start] + requires: [environment-check] parameters: puppet_manifest: puppet/manifests/deploy.pp puppet_modules: puppet/modules @@ -58,7 +66,7 @@ type: puppet groups: ['openbook'] required_for: [deploy_end] - requires: [deploy_start,controller] + requires: [deploy-openbook,controller] parameters: puppet_manifest: puppet/manifests/finalize.pp puppet_modules: puppet/modules diff --git a/doc/source/guide.rst b/doc/source/guide.rst index 46e6d32..ddbf538 100644 --- a/doc/source/guide.rst +++ b/doc/source/guide.rst @@ -29,10 +29,6 @@ Plugin configuration :alt: A screenshot of the Openbook Plugin settings UI for 8.0 :scale: 90% - .. note:: The Sharefile Username will be your e-mail and the password will be the one you setup - when you received the e-mail about your Sharefile account being created. If you do not - have Sharefile access to Talligent, please contact openbook@talligent.com. - #. Click *Save Settings* at the bottom of the page to save the configuration parameters. #. Switch to the *Nodes* tab. diff --git a/doc/source/installation.rst b/doc/source/installation.rst index dc8cd3d..222f8ef 100644 --- a/doc/source/installation.rst +++ b/doc/source/installation.rst @@ -14,7 +14,7 @@ of the plugin. You can also refer to the `CLI command reference for Fuel Plugin .. code:: bash - scp openbook*rpm root@: + scp openbook*rpm root@:/root/ #. Install the plugin using the fuel command line: @@ -31,3 +31,9 @@ of the plugin. You can also refer to the `CLI command reference for Fuel Plugin id | name | version | package_version ---|----------|---------|---------------- 1 | openbook | 1.3.0 | 4.0.0 + +#. Copy the Openbook-*.zip package to the Fuel Master node (note: should be Openbook.zip on the Fuel Master node) + + .. code:: bash + + scp Openbook-*.zip root@:/var/www/nailgun/plugins/openbook-1.3/deployment_scripts/puppet/modules/openbook/files/Openbook.zip diff --git a/environment_config.yaml b/environment_config.yaml index 15d5888..f26bda1 100644 --- a/environment_config.yaml +++ b/environment_config.yaml @@ -18,25 +18,25 @@ attributes: weight: 10 type: "text" - sharefile_user: - type: "text" - weight: 50 - value: "" - label: "Sharefile Username (e-mail)" - description: "Sharefile username is required to download Openbook" - regex: &email - source: '[a-z0-9!#$%&*+/=?^_`{|}~-]+(?:\.[a-z0-9!#$%&*+/=?^_`{|}~-]+)*@(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\.?)?[a-z0-9]?(?:[a-z0-9-]*[a-z0-9])?' - error: "Invalid email address" - - sharefile_pass: - type: "password" - weight: 51 - value: "" - label: "Sharefile Password" - description: "Sharefile password is required to download Openbook" - regex: ¬_empty_parameter - source: '\S' - error: "Invalid value" +# sharefile_user: +# type: "text" +# weight: 50 +# value: "" +# label: "Sharefile Username (e-mail)" +# description: "Sharefile username is required to download Openbook" +# regex: &email +# source: '[a-z0-9!#$%&*+/=?^_`{|}~-]+(?:\.[a-z0-9!#$%&*+/=?^_`{|}~-]+)*@(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\.?)?[a-z0-9]?(?:[a-z0-9-]*[a-z0-9])?' +# error: "Invalid email address" +# +# sharefile_pass: +# type: "password" +# weight: 51 +# value: "" +# label: "Sharefile Password" +# description: "Sharefile password is required to download Openbook" +# regex: ¬_empty_parameter +# source: '\S' +# error: "Invalid value" jvm_heap_size: value: '1'