diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..022787b --- /dev/null +++ b/.gitignore @@ -0,0 +1,11 @@ +.tox +.build +*.pyc +repositories/centos/* +repositories/ubuntu/* +*.rpm +*.md5 +doc/build +deployment_scripts/puppet/modules/apt +deployment_scripts/puppet/modules/mariadbrepo +deployment_scripts/puppet/modules/stdlib diff --git a/README.md b/README.md index dcf700a..1e79d65 100644 --- a/README.md +++ b/README.md @@ -31,6 +31,6 @@ you to better plan for new capacity. ## Requirements | Requirement | Version/Comment | |----------------------------------|-------------------------------------------| -| Mirantis OpenStack compatility | 7.0 | +| Mirantis OpenStack compatility | 8.0 | | Distribution Supported | Ubuntu | | Talligent Sharefile access | Contact openbook@talligent.com for access | diff --git a/TestPlanforOpenbookFuelPlugin.pdf b/TestPlanforOpenbookFuelPlugin.pdf index 17dcb82..288aa6c 100644 Binary files a/TestPlanforOpenbookFuelPlugin.pdf and b/TestPlanforOpenbookFuelPlugin.pdf differ diff --git a/deployment_scripts/puppet/modules/openbook/manifests/db/mysql.pp b/deployment_scripts/puppet/modules/openbook/manifests/db/mysql.pp index f425343..9b649f4 100644 --- a/deployment_scripts/puppet/modules/openbook/manifests/db/mysql.pp +++ b/deployment_scripts/puppet/modules/openbook/manifests/db/mysql.pp @@ -17,36 +17,63 @@ class openbook::db::mysql { include openbook::params - exec {'import mariadb repo key': - command => '/usr/bin/apt-key --keyring /etc/apt/trusted.gpg.d/mariadb.gpg adv --recv-keys --keyserver hkp://keyserver.ubuntu.com:80 0xcbcb082a1bb943db', - unless => '/usr/bin/test -f /etc/apt/trusted.gpg.d/mariadb.gpg' - } - - file { 'mariadb.list': - path => '/etc/apt/sources.list.d/mariadb.list', - content => "deb http://ftp.osuosl.org/pub/mariadb/repo/10.0/ubuntu ${::lsbdistcodename} main", - } - - exec { "mariadb update": - command => "/usr/bin/apt-get update", - subscribe => File['mariadb.list'], - refreshonly => true, - require => File['/etc/apt/sources.list.d/mariadb.list'] + #exec {'import mariadb repo key': + # command => '/usr/bin/apt-key --keyring /etc/apt/trusted.gpg.d/mariadb.gpg adv --recv-keys --keyserver hkp://keyserver.ubuntu.com:80 0xcbcb082a1bb943db', + # unless => '/usr/bin/test -f /etc/apt/trusted.gpg.d/mariadb.gpg' + #} + # + #file { 'mariadb.list': + # path => '/etc/apt/sources.list.d/mariadb.list', + # content => "deb http://ftp.osuosl.org/pub/mariadb/repo/10.0/ubuntu ${::lsbdistcodename} main", + #} + # + #exec { "mariadb update": + # command => "/usr/bin/apt-get update", + # subscribe => File['mariadb.list'], + # refreshonly => true, + # require => File['/etc/apt/sources.list.d/mariadb.list'] + #} + # + #package { "$openbook::params::db_server_pkg": + # ensure => present, + # require => Exec['mariadb update'] + #} + #package { "$openbook::params::db_client_pkg": + # ensure => present, + # require => Exec['mariadb update'] + #} + # + #service { 'mysql': + # ensure => running, + # enable => true, + # require => Package[$openbook::params::db_server_pkg] + #} + + class { 'mariadbrepo': + version => "$openbook::params::db_version" } - package { "$openbook::params::db_server_pkg": + package { "$openbook::params::db_server_pkg" : ensure => present, - require => Exec['mariadb update'] + require => Class['mariadbrepo'] } - package { "$openbook::params::db_client_pkg": - ensure => present, - require => Exec['mariadb update'] + + package { "$openbook::params::db_client_pkg" : + ensure => present, + require => Class['mariadbrepo'] } service { 'mysql': ensure => running, enable => true, - require => Package[$openbook::params::db_server_pkg] + require => Package["$openbook::params::db_server_pkg"] + } + + exec { 'mysql_set_binlog_format': + notify => Service['mysql'], + path => '/bin:/sbin:/usr/bin:/usr/sbin', + command => 'sed -i "/\[mysqld\]/a\binlog_format = MIXED" /etc/mysql/my.cnf', + require => Package["$openbook::params::db_server_pkg"] } file { '/tmp/openbook': @@ -64,7 +91,7 @@ class openbook::db::mysql { command => "/usr/bin/mysql -p'${openbook::params::db_password}' < /tmp/openbook/create_openbook_schemas.sql && /usr/bin/touch /root/.schema.created", logoutput => true, unless => '/usr/bin/test -f /root/.schema.created', - require => [File['/tmp/openbook/create_openbook_schemas.sql'], Package[$openbook::params::db_server_pkg]] + require => [File['/tmp/openbook/create_openbook_schemas.sql'], Package[$openbook::params::db_server_pkg], Exec['mysql_root_password']] } file { '/root/.my.cnf': diff --git a/deployment_scripts/puppet/modules/openbook/manifests/finalize.pp b/deployment_scripts/puppet/modules/openbook/manifests/finalize.pp index 005c31c..2fe74b2 100644 --- a/deployment_scripts/puppet/modules/openbook/manifests/finalize.pp +++ b/deployment_scripts/puppet/modules/openbook/manifests/finalize.pp @@ -13,21 +13,24 @@ # under the License. class openbook::finalize { - $admin_settings = hiera('access') - $admin_username = $admin_settings['user'] - $admin_password = $admin_settings['password'] - $admin_tenant = $admin_settings['tenant'] + include openbook::params + $admin_username = $openbook::params::admin_username + $admin_password = $openbook::params::admin_password + $admin_tenant = $openbook::params::admin_tenant $management_vip = hiera('management_vip') $keystone_admin_url = "http://${management_vip}:35357/v2.0" $os_auth_url = "http://${management_vip}:5000/v2.0" +# $management_vip = $openbook::params::management_vip +# $keystone_admin_url = $openbook::params::keystone_admin_url +# $os_auth_url = $openbook::params::keystone_admin_url - $keystone_client = 'python-openstackclient' - $keystone_command = 'openstack' - $keystone_args = "project show ${admin_tenant}" + $keystone_client = $openbook::params::keystone_client + $keystone_command = $openbook::params::keystone_command + $keystone_args = $openbook::params::keystone_args - $public_ssl_hash = hiera('public_ssl') - $ip = hiera('public_vip') + $public_ssl_hash = $openbook::params::public_ssl_hash + $ip = $openbook::params::ip # Need to add trust chain so that Openbook can talk to https endpoints class { 'openbook::ssl_add_trust_chain': }-> diff --git a/deployment_scripts/puppet/modules/openbook/manifests/params.pp b/deployment_scripts/puppet/modules/openbook/manifests/params.pp index cc07b94..9cd9cb5 100644 --- a/deployment_scripts/puppet/modules/openbook/manifests/params.pp +++ b/deployment_scripts/puppet/modules/openbook/manifests/params.pp @@ -14,39 +14,47 @@ # under the License. # class openbook::params { - $openstack_version = hiera('openstack_version') - $fuel_version = hiera('fuel_version') - - - $admin_settings = hiera('access') + $admin_settings = hiera_hash('access') + #$admin_username = $admin_settings['user'] + #$admin_password = $admin_settings['password'] + #$admin_tenant = $admin_settings['tenant'] $admin_username = $admin_settings['user'] $admin_password = $admin_settings['password'] $admin_tenant = $admin_settings['tenant'] - $openbook = hiera('openbook') - $management_vip = hiera('management_vip') - $keystone_admin_url = "http://${management_vip}:35357/v2.0" - $os_auth_url = "http://${management_vip}:5000/v2.0" +# $management_vip = hiera('management_vip') +# $keystone_admin_url = "http://${management_vip}:35357/v2.0" +# $os_auth_url = "http://${management_vip}:5000/v2.0" + $keystone_client = 'python-openstackclient' + $keystone_command = 'openstack' + $keystone_args = "project show ${admin_tenant}" + + $public_ssl_hash = hiera('public_ssl') + $ip = hiera('public_vip') + + $openbook = hiera_hash('openbook') $jvm_heap = $openbook['jvm_heap_size'] + $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_version = '10.1' + $keystore_pass = 'rG8EE69CC0OuQKW+6pC6LytgRQM7QZUmt5CDySUgupY=' + $ipaddress = $::ipaddress + case $::operatingsystem { 'Ubuntu', 'Debian': { - $db_server_pkg = 'mariadb-server-10.0' - $db_client_pkg = 'mariadb-client-core-10.0' - $db_password = 'Tall!g3nt' + $db_server_pkg = 'mariadb-server' + $db_client_pkg = "mariadb-client-${db_version}" $app_server_pkg = 'tomcat7' - $openbook_version = '2.5.245' - $keystore_pass = 'rG8EE69CC0OuQKW+6pC6LytgRQM7QZUmt5CDySUgupY=' - $ipaddress = $::ipaddress + $java_pkg = 'openjdk-8-jdk' - $sharefile_hostname = 'talligent.sharefile.com' - $sharefile_username = $openbook['sharefile_user'] - $sharefile_password = $openbook['sharefile_pass'] - $sharefile_client_id = 'eC8y8eeoeunxzOizZq2oeknIVfA9Jyjg' - $sharefile_client_secret = 'PehmEqzEgKuGm2XOZWXIOUY3GyrKcfSmNtwPptPwt0tWxihs' - $sharefile_download_path = '/tmp/Openbook.zip' - } default: { fail("unsuported osfamily ${::osfamily}, currently Ubuntu is the only supported platform") @@ -54,3 +62,4 @@ class openbook::params { } } + diff --git a/deployment_scripts/puppet/modules/openbook/manifests/tomcat/server.pp b/deployment_scripts/puppet/modules/openbook/manifests/tomcat/server.pp index bfb0aa7..3443b3d 100644 --- a/deployment_scripts/puppet/modules/openbook/manifests/tomcat/server.pp +++ b/deployment_scripts/puppet/modules/openbook/manifests/tomcat/server.pp @@ -16,8 +16,18 @@ class openbook::tomcat::server { include openbook::params + include apt $ipaddress = $::ipaddress - + + # Add OpenJDK repo & install version 8 + apt::ppa { 'ppa:openjdk-r/ppa':} -> + package { "$openbook::params::java_pkg": + ensure => present, + }-> + file { '/usr/lib/jvm/default-java': + ensure => 'link', + target => '/usr/lib/jvm/java-8-openjdk-amd64', + }-> package { "$openbook::params::app_server_pkg": ensure => present, } diff --git a/deployment_scripts/puppet/modules/openbook/templates/config_resource_manager.sh.erb b/deployment_scripts/puppet/modules/openbook/templates/config_resource_manager.sh.erb index 34dda72..8d06c2e 100644 --- a/deployment_scripts/puppet/modules/openbook/templates/config_resource_manager.sh.erb +++ b/deployment_scripts/puppet/modules/openbook/templates/config_resource_manager.sh.erb @@ -7,15 +7,16 @@ TENANT_ID=$($KEYSTONE_COMMAND $KEYSTONE_ARGS | grep id | awk -F\| '{print $3}' | read -d '' METADATA <", "userName": "<%= @admin_username %>", "adminTenantId": "$TENANT_ID", + "keystoneVersion": "2", "password": "<%= @admin_password %>", "isMemberOfAllProjects": false }, @@ -39,7 +40,7 @@ metadata={ } EOF -RESULT=$(curl -s -k --user 'openbook:Tall!g3nt' -XPOST -D - 'https://<%= @ipaddress %>:8443/Openbook/resource/resourcemanagers' -H 'Content-Type: application/x-www-form-urlencoded' -d 'name=MOS Environment' -d 'description=Mirantis OpenStack Environment' -d 'vendorType=OpenStack' --data-urlencode "$METADATA") +RESULT=$(curl -s -k --user 'openbook:Tall!g3nt' -XPOST -D - 'https://<%= @ipaddress %>:8443/Openbook/resource/serviceManagers' -H 'Content-Type: application/x-www-form-urlencoded' -d 'name=MOS Environment' -d 'description=Mirantis OpenStack Environment' -d 'type=OpenStack' --data-urlencode "$METADATA") echo "$RESULT" >> /tmp/resource_manager_result.txt diff --git a/deployment_scripts/puppet/modules/openbook/templates/openbook.properties.erb b/deployment_scripts/puppet/modules/openbook/templates/openbook.properties.erb index da0e62d..f07096b 100644 --- a/deployment_scripts/puppet/modules/openbook/templates/openbook.properties.erb +++ b/deployment_scripts/puppet/modules/openbook/templates/openbook.properties.erb @@ -1,4 +1,5 @@ -ROOT_PROVIDER_PUBLIC_URL = https://<%= @ipaddress %>:8443 +#ROOT_PROVIDER_PUBLIC_URL = https://<%= @ipaddress %>:8443 +ROOT_PROVIDER_PUBLIC_URL=https\://127.0.0.1\:8443 DB_USER = openbook DB_PASSWORD = Tall!g3nt diff --git a/deployment_scripts/puppet/modules/openbook/templates/test_connectivity.sh.erb b/deployment_scripts/puppet/modules/openbook/templates/test_connectivity.sh.erb index 7411b75..36fd050 100644 --- a/deployment_scripts/puppet/modules/openbook/templates/test_connectivity.sh.erb +++ b/deployment_scripts/puppet/modules/openbook/templates/test_connectivity.sh.erb @@ -5,7 +5,7 @@ KEYSTONE_ARGS=' <%= @keystone_args %>' TENANT_ID=$($KEYSTONE_COMMAND $KEYSTONE_ARGS | grep id | awk -F\| '{print $3}' | cut -d ' ' -f2) -RESULT=$(curl -s -k --user 'openbook:Tall!g3nt' -D - https://<%= @ipaddress %>:8443/Openbook/resource/resourcemanagers/testconnection/OpenStack -H "Content-Type: application/x-www-form-urlencoded" -H "X-Connection-Details: {'connectionUrl':'<%= @keystone_admin_url %>','userName':'<%= @admin_username %>','adminTenantId':'$TENANT_ID','password':'<%= @admin_password %>'}") +RESULT=$(curl -s -k --user 'openbook:Tall!g3nt' -D - https://<%= @ipaddress %>:8443/Openbook/resource/serviceManagers/testConnection/OpenStack -H "Content-Type: application/x-www-form-urlencoded" -H "X-Connection-Details: {'connectionUrl':'<%= @keystone_admin_url %>','userName':'<%= @admin_username %>','keystoneVersion':2,'adminTenantId':'$TENANT_ID','password':'<%= @admin_password %>'}") echo "$RESULT" >> /tmp/connectivity-test-result.txt diff --git a/deployment_tasks.yaml b/deployment_tasks.yaml index 0d9d5fe..fccf2cf 100644 --- a/deployment_tasks.yaml +++ b/deployment_tasks.yaml @@ -1,12 +1,66 @@ +# Groups - id: openbook type: group role: [openbook] - tasks: + tasks: &common_tasks - hiera +# - setup_repositories +# - fuel_pkgs - globals - netconfig + - hosts +# - hiera +# - globals +# - netconfig required_for: [deploy_end] requires: [deploy_start,controller] parameters: strategy: - type: parallel + type: one_by_one + #type: parallel + +# Configure haproxy on OpenStack Controllers +#- id: openstack-haproxy-openbook +# type: puppet +# groups: [primary-controller, controller] +# required_for: [deploy_end] +# requires: [deploy_start, openstack-haproxy, rabbitmq] +# parameters: +# puppet_manifest: puppet/manifests/controller-vip.pp +# puppet_modules: puppet/modules:/etc/puppet/modules +# timeout: 720 + +# Tasks +# Enviornment check +- id: environment-check + type: puppet + groups: ['openbook'] + required_for: [deploy_end] + requires: [deploy_start,globals] + parameters: + puppet_manifest: puppet/manifests/check_environment_configuration.pp + puppet_modules: puppet/modules + timeout: 300 + +# Deploy Openbook +- id: deploy-openbook + type: puppet + groups: ['openbook'] + required_for: [deploy_end] + requires: [deploy_start] + parameters: + puppet_manifest: puppet/manifests/deploy.pp + puppet_modules: puppet/modules + timeout: 1500 + +# Finalize Openbook deployment +- id: finalize-openbook + type: puppet + groups: ['openbook'] + required_for: [deploy_end] + requires: [deploy_start,controller] + parameters: + puppet_manifest: puppet/manifests/finalize.pp + puppet_modules: puppet/modules + timeout: 300 + diff --git a/doc/source/_static/deployment-success.png b/doc/source/_static/deployment-success.png index 06c89e7..278f1ec 100644 Binary files a/doc/source/_static/deployment-success.png and b/doc/source/_static/deployment-success.png differ diff --git a/doc/source/_static/openbook-node.png b/doc/source/_static/openbook-node.png index 097c351..7e6e068 100644 Binary files a/doc/source/_static/openbook-node.png and b/doc/source/_static/openbook-node.png differ diff --git a/doc/source/_static/plugin-openbook-config_s.png b/doc/source/_static/plugin-openbook-config_s.png index 99211b3..6ff2ad4 100644 Binary files a/doc/source/_static/plugin-openbook-config_s.png and b/doc/source/_static/plugin-openbook-config_s.png differ diff --git a/doc/source/_static/service-manager-verify.png b/doc/source/_static/service-manager-verify.png new file mode 100644 index 0000000..0b91333 Binary files /dev/null and b/doc/source/_static/service-manager-verify.png differ diff --git a/doc/source/conf.py b/doc/source/conf.py index c844610..edd4ddb 100644 --- a/doc/source/conf.py +++ b/doc/source/conf.py @@ -47,16 +47,16 @@ master_doc = 'index' # General information about the project. project = u'The Openbook plugin for Fuel' -copyright = u'2015, Talligent Inc.' +copyright = u'2016, Talligent Inc.' # The version info for the project you're documenting, acts as replacement for # |version| and |release|, also used in various other places throughout the # built documents. # # The short X.Y version. -version = '1.1' +version = '1.3' # The full version, including alpha/beta/rc tags. -release = '1.1-1.1.0-1' +release = '1.3-1.3.0-1' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. @@ -233,7 +233,7 @@ latex_elements = { 'classoptions': ',openany,oneside', 'babel' : '\\usepackage[e # One entry per manual page. List of tuples # (source start file, name, description, authors, manual section). man_pages = [ - ('index', 'fuel-plugin-openbook', u'Guide to the Openbook Plugin ver. 1.1-1.1.0-1 for Fuel', + ('index', 'fuel-plugin-openbook', u'Guide to the Openbook Plugin ver. 1.3-1.3.0-1 for Fuel', [u'Talligent Inc.'], 1) ] @@ -276,7 +276,7 @@ pdf_inline_footnotes = True epub_title = u'The Openbook Plugin for Fuel' epub_author = u'Talligent Inc.' epub_publisher = u'Talligent Inc.' -epub_copyright = u'2015, Talligent Inc.' +epub_copyright = u'2016, Talligent Inc.' # The basename for the epub file. It defaults to the project name. #epub_basename = u'fuel-plugin-openbook' diff --git a/doc/source/guide.rst b/doc/source/guide.rst index 527d12e..46e6d32 100644 --- a/doc/source/guide.rst +++ b/doc/source/guide.rst @@ -8,23 +8,25 @@ User Guide Plugin configuration -------------------- -#. `Create a new environment `_ +#. `Create a new environment `_ with the Fuel UI wizard. At the moment only the Ubuntu distribution is supported. + + .. note:: Please note – the Ceilometer service is not required for all Openbook use cases. Where Ceilometer + is not available or has been disabled, you still have the ability to bill for service instances such as + instances, volumes, or floating IPs in intervals of 15 minutes (service instances created and deleted + within the 15 minute interval will not be billed). In this circumstance, unselect the incremental + sync, and decrease the interval for the full resync. + + With Ceilometer, you have the ability to bill for service instances in intervals of a second or ability + to bill for metered resources such as network bandwidth, object storage bytes on disk. - * When stepping through the 'new OpenStack environment' wizard, be sure to enable - Ceilometer in the Additonal Services section. Openbook relies on various endpoints - for data, one of which is Ceilometer. - - .. image:: _static/ceilometer-select_s.png - :alt: A screenshot of the Install Ceilometer step - #. Click on the Settings tab of the Fuel web UI. - Select the "Openbook Plugin" tab, enable the plugin by clicking on the + Select "Other", enable the plugin by clicking on the "Openbook Plugin" checkbox and fill-in the required fields (default for 'database password' is Tall!g3nt): .. image:: _static/plugin-openbook-config_s.png - :alt: A screenshot of the Openbook Plugin settings UI for 7.0 + :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 @@ -35,16 +37,16 @@ Plugin configuration #. Switch to the *Nodes* tab. -#. After `adding all OpenStack nodes/roles `_, +#. After `adding all OpenStack nodes/roles `_, add an Openbook node (optional: rename to something meaningful, such as "openbook"): .. image:: _static/openbook-node.png :alt: A screenshot of the Openbook host name :scale: 90% -#. Select the *Networks* tab, scroll to the bottom, and `Verify Networks `_. +#. Select the *Networks* tab, select *Connectivity Check*, and `Verify Networks `_. -#. Then finally, `Deploy Changes `_. +#. Then finally, `Deploy Changes `_. .. _plugin_install_verification: @@ -60,7 +62,7 @@ the plugin is deployed and will give the URL schema for accessing the Openbook U Use the fuel command line to retrieve the IP address of the openbook node. -.. _retrieve-ip: +.. _retrieve_ip: .. code:: bash @@ -68,7 +70,7 @@ Use the fuel command line to retrieve the IP address of the openbook node. id | status | name | cluster | ip | [..] | roles | [..] ---|----------|---------------|---------|-----------|------|-------------------|------ 2 | ready | compute-01 | 2 | 10.20.0.4 | | cinder, compute | - 1 | ready | controller-01 | 2 | 10.20.0.3 | | controller, mongo | + 1 | ready | controller-01 | 2 | 10.20.0.3 | | controller | 3 | ready | openbook | 2 | 10.20.0.5 | | openbook | .. | ..... | ..............| ... | ......... | | ............... | @@ -77,4 +79,12 @@ In this example, the Openbook UI would be accessed at ``https://10.20.0.5:8443/O Using Openbook -------------- -For instructions on using Openbook, please see the `official documentation `_. +Official documentation for various features of Openbook can be found below. + +* Guide: `Creating a Rate Plan `_ + +* Guide: `Capacity Reports `_ + +* Guide: `Extracting Data from Openbook (API) `_ + + diff --git a/doc/source/index.rst b/doc/source/index.rst index aa18cd9..0a5a090 100644 --- a/doc/source/index.rst +++ b/doc/source/index.rst @@ -4,7 +4,7 @@ contain the root `toctree` directive. ================================================ -Guide to the Openbook Plugin ver. 1.1.0 for Fuel +Guide to the Openbook Plugin ver. 1.3.0 for Fuel ================================================ User documentation @@ -16,3 +16,6 @@ User documentation overview installation guide + verification + troubleshooting + release diff --git a/doc/source/installation.rst b/doc/source/installation.rst index 75af5e2..dc8cd3d 100644 --- a/doc/source/installation.rst +++ b/doc/source/installation.rst @@ -7,8 +7,8 @@ How to install the plugin Per the :ref:`Requirements section `, `Contact Talligent `_ to get access to the Talligent Sharefile account for downloading Openbook and the Openbook 'How to guide'. -Please refer to the `Install Fuel Plugins `_ section from the User Guide for installation -of the plugin. You can also refer to the `CLI command reference for Fuel Plugins `_. +Please refer to the `Install Fuel Plugins `_ section from the Fuel Installation Guide for installation +of the plugin. You can also refer to the `CLI command reference for Fuel Plugins `_. #. Copy the plugin file to the Fuel Master node. @@ -30,4 +30,4 @@ of the plugin. You can also refer to the `CLI command reference for Fuel Plugin [root@fuel ~]# fuel plugins id | name | version | package_version ---|----------|---------|---------------- - 1 | openbook | 1.1.0 | 3.0.0 + 1 | openbook | 1.3.0 | 4.0.0 diff --git a/doc/source/overview.rst b/doc/source/overview.rst index 16fc936..1d81b4b 100644 --- a/doc/source/overview.rst +++ b/doc/source/overview.rst @@ -39,7 +39,7 @@ Requirements +----------------------------------+-----------------------------------------------------------------------+ | **Requirement** | **Version/Comment** | +==================================+=======================================================================+ -| Mirantis OpenStack compatility | 7.0 or higher | +| Mirantis OpenStack compatility | 8.0 | +----------------------------------+-----------------------------------------------------------------------+ | Distribution Supported | Ubuntu | +----------------------------------+-----------------------------------------------------------------------+ @@ -55,4 +55,4 @@ Limitations A current limitation of this plugin is that it not possible to display in the Fuel web UI the URL where the Openbook interface can be reached when the deployment has completed. Instructions are provided in the -:ref:`User Guide ` about how you can obtain this URL using the `fuel command line `_. +:ref:`User Guide ` about how you can obtain this URL. diff --git a/doc/source/release.rst b/doc/source/release.rst new file mode 100644 index 0000000..fe8efb1 --- /dev/null +++ b/doc/source/release.rst @@ -0,0 +1,15 @@ +.. _release_notes: + +Release Notes +============= + +The release of Openbook v3 is based on several months of close interaction and detailed feedback from operators of large scale private and public clouds based on OpenStack and VMware. The refined feature set available in v3 includes: + +* Clear reports of utilization and growth trends at the cloud provider, business unit, cost center, and tenant level for capacity and budget planning. + +* A VMware adapter to support hybrid cloud environments and provide costs comparisons of workloads running in VMware or OpenStack instances. Azure support is coming soon. + +* Enhanced chargeback and showback reporting that rolls up multiple tenants to a single cost center, while also providing ad hoc drill down of the detail resource consumption and associated costs. + +* The ability to include non-OpenStack infrastructure elements, custom metrics, or services into rates plans and billing models via API or user-defined fields. + diff --git a/doc/source/troubleshooting.rst b/doc/source/troubleshooting.rst new file mode 100644 index 0000000..b3b9d65 --- /dev/null +++ b/doc/source/troubleshooting.rst @@ -0,0 +1,20 @@ +.. _troubleshooting: + +Troubleshooting +=============== + +If the dashboard is not accessible, check the following: + +1. Check that the Tomcat service is running:: + + [root@node-12]# service tomcat7 status + +#. If Tomcat service is down, restart it:: + + [root@node-12]# service tomcat7 start + + +If the charts are not updating, check that the license key hasn't expired + +1. Login to the Dashboard as an administrator, select 'License', and verify that there are "Days Remaining" + diff --git a/doc/source/verification.rst b/doc/source/verification.rst new file mode 100644 index 0000000..36c2f0e --- /dev/null +++ b/doc/source/verification.rst @@ -0,0 +1,14 @@ +.. _verification: + +Verification +============ + +The plugin automatically connects Openbook to the OpenStack environment. To verify correct operation, login +as administrator to the Openbook dashboard (using :ref:`the node IP `), select 'Service Managers' +under CONFIGURE, right-click the "MOS Environment" service manager, and select 'Edit Service Manager'. Click +"Test Connection" to see "Authentication Succeeded" message. + + .. image:: _static/service-manager-verify.png + :alt: A screenshot of the Openbook Service Manager verification + :scale: 90% + diff --git a/environment_config.yaml b/environment_config.yaml index 29c01db..15d5888 100644 --- a/environment_config.yaml +++ b/environment_config.yaml @@ -1,11 +1,4 @@ attributes: - metadata: - restrictions: - - condition: "settings:additional_components.ceilometer.value == false" - strict: true - message: "Ceilometer (OpenStack Telemetry) is required and must be enabled in the environment" - action: "disable" - openbook_text: value: 'Openbook Fuel Plugin' label: 'Openbook plugin' diff --git a/metadata.yaml b/metadata.yaml index f1fb313..1a31f0a 100644 --- a/metadata.yaml +++ b/metadata.yaml @@ -1,10 +1,10 @@ # Plugin name name: openbook title: Openbook Plugin -version: '1.1.0' +version: '1.3.2' description: Deploys Openbook for billing/invoicing and customer lifecycle management for OpenStack. Openbook URL schema is https://:8443/Openbook -fuel_version: ['7.0'] +fuel_version: ['8.0'] licenses: ['Apache License Version 2.0'] authors: ['Talligent Inc.'] homepage: 'https://github.com/openstack/fuel-plugin-openbook' @@ -13,10 +13,14 @@ groups: ['monitoring'] # The plugin is compatible with releases in the list releases: - os: ubuntu - version: 2015.1.0-7.0 + version: liberty-8.0 mode: ['ha'] deployment_scripts_path: deployment_scripts/ repository_path: repositories/ubuntu # Version of plugin package -package_version: '3.0.0' +#package_version: '3.0.0' +package_version: '4.0.0' + +# Can be installed after MOS environment deployment +is_hotpluggable: true diff --git a/network_roles.yaml b/network_roles.yaml index 200b24e..cd989e3 100644 --- a/network_roles.yaml +++ b/network_roles.yaml @@ -6,9 +6,10 @@ # Should be true if network role requires subnet being set subnet: true # Should be true if network role requires gateway being set - gateway: false + gateway: true vip: - name: "openbook_public" namespace: "haproxy" - node_roles: ["openbook"] + #node_roles: ["openbook"] + alias: "openbook_public" diff --git a/node_roles.yaml b/node_roles.yaml index 9ece6a8..113f663 100644 --- a/node_roles.yaml +++ b/node_roles.yaml @@ -10,3 +10,5 @@ openbook: - cinder - ceph-osd - mongo + - compute-vmware + - cinder-vmware diff --git a/pre_build_hook b/pre_build_hook index 074c603..bdee454 100755 --- a/pre_build_hook +++ b/pre_build_hook @@ -3,61 +3,255 @@ set -eux . "$(dirname "$(readlink -f "$0")")"/functions.sh -# Packages needed for MariaDB -download_package http://ftp.osuosl.org/pub/mariadb/repo/10.0/ubuntu/pool/main/m/mariadb-10.0/mysql-common_10.0.22+maria-1~trusty_all.deb \ -http://ftp.osuosl.org/pub/mariadb/repo/10.0/ubuntu/pool/main/m/mariadb-10.0/mariadb-common_10.0.22+maria-1~trusty_all.deb \ -http://ftp.osuosl.org/pub/mariadb/repo/10.0/ubuntu/pool/main/m/mariadb-10.0/libmariadbclient18_10.0.22+maria-1~trusty_amd64.deb \ -http://ftp.osuosl.org/pub/mariadb/repo/10.0/ubuntu/pool/main/m/mariadb-10.0/libmysqlclient18_10.0.22+maria-1~trusty_amd64.deb \ -http://ftp.osuosl.org/pub/mariadb/repo/10.0/ubuntu/pool/main/m/mariadb-10.0/mariadb-client-core-10.0_10.0.22+maria-1~trusty_amd64.deb \ -http://ftp.osuosl.org/pub/mariadb/repo/10.0/ubuntu/pool/main/m/mariadb-10.0/mariadb-client-10.0_10.0.22+maria-1~trusty_amd64.deb \ -http://ftp.osuosl.org/pub/mariadb/repo/10.0/ubuntu/pool/main/m/mariadb-10.0/mariadb-server-core-10.0_10.0.22+maria-1~trusty_amd64.deb \ -http://ftp.osuosl.org/pub/mariadb/repo/10.0/ubuntu/pool/main/m/mariadb-10.0/mariadb-server-10.0_10.0.22+maria-1~trusty_amd64.deb \ -http://archive.ubuntu.com/ubuntu/pool/main/liba/libaio/libaio1_0.3.109-4_amd64.deb \ -http://archive.ubuntu.com/ubuntu/pool/main/libd/libdbi-perl/libdbi-perl_1.630-1_amd64.deb \ -http://archive.ubuntu.com/ubuntu/pool/main/libd/libdbd-mysql-perl/libdbd-mysql-perl_4.025-1_amd64.deb \ -http://archive.ubuntu.com/ubuntu/pool/main/libh/libhtml-template-perl/libhtml-template-perl_2.95-1_all.deb +# Puppet manifests +APT_TARBALL_URL="https://forgeapi.puppetlabs.com/v3/files/puppetlabs-apt-2.2.1.tar.gz" +STDLIB_TARBALL_URL="https://forgeapi.puppetlabs.com/v3/files/puppetlabs-stdlib-4.11.0.tar.gz" +MARIADBREPO_TARBALL_URL="https://forgeapi.puppet.com/v3/files/yguenane-mariadbrepo-0.2.1.tar.gz" + +# Packages needed for MariaDB (mariadb-server) +#download_package http://ftp.osuosl.org/pub/mariadb/repo/10.0/ubuntu/pool/main/m/mariadb-10.0/mysql-common_10.0.25+maria-1~trusty_all.deb \ +#ttp://ftp.osuosl.org/pub/mariadb/repo/10.0/ubuntu/pool/main/m/mariadb-10.0/mariadb-common_10.0.25+maria-1~trusty_all.deb \ +#http://ftp.osuosl.org/pub/mariadb/repo/10.0/ubuntu/pool/main/m/mariadb-10.0/libmariadbclient18_10.0.25+maria-1~trusty_amd64.deb \ +#http://ftp.osuosl.org/pub/mariadb/repo/10.0/ubuntu/pool/main/m/mariadb-10.0/libmysqlclient18_10.0.25+maria-1~trusty_amd64.deb \ +#http://ftp.osuosl.org/pub/mariadb/repo/10.0/ubuntu/pool/main/m/mariadb-10.0/mariadb-client-core-10.0_10.0.25+maria-1~trusty_amd64.deb \ +#http://ftp.osuosl.org/pub/mariadb/repo/10.0/ubuntu/pool/main/m/mariadb-10.0/mariadb-client-10.0_10.0.25+maria-1~trusty_amd64.deb \ +#http://ftp.osuosl.org/pub/mariadb/repo/10.0/ubuntu/pool/main/m/mariadb-10.0/mariadb-server-core-10.0_10.0.25+maria-1~trusty_amd64.deb \ +#http://ftp.osuosl.org/pub/mariadb/repo/10.0/ubuntu/pool/main/m/mariadb-10.0/mariadb-server-10.0_10.0.25+maria-1~trusty_amd64.deb \ +#http://ftp.osuosl.org/pub/mariadb/repo/10.0/ubuntu/pool/main/m/mariadb-10.0/mariadb-server_10.0.25+maria-1~trusty_all.deb \ +#http://nova.clouds.archive.ubuntu.com/ubuntu/pool/main/liba/libaio/libaio1_0.3.109-4_amd64.deb \ +#http://nova.clouds.archive.ubuntu.com/ubuntu/pool/main/r/readline5/libreadline5_5.2+dfsg-2_amd64.deb \ +#http://nova.clouds.archive.ubuntu.com/ubuntu/pool/main/libd/libdbi-perl/libdbi-perl_1.630-1_amd64.deb \ +#http://nova.clouds.archive.ubuntu.com/ubuntu/pool/main/libd/libdbd-mysql-perl/libdbd-mysql-perl_4.025-1_amd64.deb \ +#http://nova.clouds.archive.ubuntu.com/ubuntu/pool/main/libh/libhtml-template-perl/libhtml-template-perl_2.95-1_all.deb + # Packages needed for Tomcat -download_package http://archive.ubuntu.com/ubuntu/pool/main/liba/libasyncns/libasyncns0_0.8-4ubuntu2_amd64.deb \ -http://archive.ubuntu.com/ubuntu/pool/main/a/avahi/libavahi-common-data_0.6.31-4ubuntu1_amd64.deb \ -http://archive.ubuntu.com/ubuntu/pool/main/a/avahi/libavahi-common3_0.6.31-4ubuntu1_amd64.deb \ -http://archive.ubuntu.com/ubuntu/pool/main/a/avahi/libavahi-client3_0.6.31-4ubuntu1_amd64.deb \ -http://archive.ubuntu.com/ubuntu/pool/main/c/cups/libcups2_1.7.2-0ubuntu1.6_amd64.deb \ -http://archive.ubuntu.com/ubuntu/pool/main/libo/libogg/libogg0_1.3.1-1ubuntu1_amd64.deb \ -http://archive.ubuntu.com/ubuntu/pool/main/f/flac/libflac8_1.3.0-2ubuntu0.14.04.1_amd64.deb \ -http://archive.ubuntu.com/ubuntu/pool/main/f/fonts-dejavu/fonts-dejavu-core_2.34-1ubuntu1_all.deb \ -http://archive.ubuntu.com/ubuntu/pool/main/f/fontconfig/fontconfig-config_2.11.0-0ubuntu4.1_all.deb \ -http://archive.ubuntu.com/ubuntu/pool/main/f/fontconfig/libfontconfig1_2.11.0-0ubuntu4.1_amd64.deb \ -http://archive.ubuntu.com/ubuntu/pool/main/libj/libjpeg-turbo/libjpeg-turbo8_1.3.0-0ubuntu2_amd64.deb \ -http://archive.ubuntu.com/ubuntu/pool/main/l/lcms2/liblcms2-2_2.5-0ubuntu4_amd64.deb \ -http://archive.ubuntu.com/ubuntu/pool/main/n/nspr/libnspr4_4.10.7-0ubuntu0.14.04.1_amd64.deb \ -http://archive.ubuntu.com/ubuntu/pool/main/n/nss/libnss3-nssdb_3.19.2-0ubuntu0.14.04.1_all.deb \ -http://archive.ubuntu.com/ubuntu/pool/main/n/nss/libnss3_3.19.2-0ubuntu0.14.04.1_amd64.deb \ -http://archive.ubuntu.com/ubuntu/pool/main/p/pcsc-lite/libpcsclite1_1.8.10-1ubuntu1_amd64.deb \ -http://archive.ubuntu.com/ubuntu/pool/main/libv/libvorbis/libvorbis0a_1.3.2-1.3ubuntu1_amd64.deb \ -http://archive.ubuntu.com/ubuntu/pool/main/libv/libvorbis/libvorbisenc2_1.3.2-1.3ubuntu1_amd64.deb \ -http://archive.ubuntu.com/ubuntu/pool/main/libs/libsndfile/libsndfile1_1.0.25-7ubuntu2_amd64.deb \ -http://archive.ubuntu.com/ubuntu/pool/main/p/pulseaudio/libpulse0_4.0-0ubuntu11.1_amd64.deb \ -http://archive.ubuntu.com/ubuntu/pool/main/l/lksctp-tools/libsctp1_1.0.15+dfsg-1_amd64.deb \ -http://archive.ubuntu.com/ubuntu/pool/main/j/java-common/java-common_0.51_all.deb \ -http://archive.ubuntu.com/ubuntu/pool/main/j/java-common/default-jre-headless_1.7-51_amd64.deb \ -http://archive.ubuntu.com/ubuntu/pool/main/c/ca-certificates-java/ca-certificates-java_20130815ubuntu1_all.deb \ -http://archive.ubuntu.com/ubuntu/pool/main/t/tzdata/tzdata-java_2015g-0ubuntu0.14.04_all.deb \ -http://archive.ubuntu.com/ubuntu/pool/main/libj/libjpeg8-empty/libjpeg8_8c-2ubuntu8_amd64.deb \ -http://archive.ubuntu.com/ubuntu/pool/main/o/openjdk-7/openjdk-7-jre-headless_7u85-2.6.1-5ubuntu0.14.04.1_amd64.deb \ -http://archive.ubuntu.com/ubuntu/pool/main/libc/libcommons-collections3-java/libcommons-collections3-java_3.2.1-6_all.deb \ -http://archive.ubuntu.com/ubuntu/pool/main/c/commons-pool/libcommons-pool-java_1.6-2_all.deb \ -http://archive.ubuntu.com/ubuntu/pool/main/libc/libcommons-dbcp-java/libcommons-dbcp-java_1.4-3ubuntu1_all.deb \ -http://archive.ubuntu.com/ubuntu/pool/main/e/ecj/libecj-java_3.9.0-1_all.deb \ -http://archive.ubuntu.com/ubuntu/pool/main/g/geronimo-jta-1.1-spec/libgeronimo-jta-1.1-spec-java_1.1.1-3ubuntu1_all.deb \ -http://archive.ubuntu.com/ubuntu/pool/main/t/tomcat7/libservlet3.0-java_7.0.52-1ubuntu0.3_all.deb \ -http://archive.ubuntu.com/ubuntu/pool/main/t/tomcat7/libtomcat7-java_7.0.52-1ubuntu0.3_all.deb \ -http://archive.ubuntu.com/ubuntu/pool/main/l/lksctp-tools/lksctp-tools_1.0.15+dfsg-1_amd64.deb \ -http://archive.ubuntu.com/ubuntu/pool/main/t/tomcat7/tomcat7-common_7.0.52-1ubuntu0.3_all.deb \ -http://archive.ubuntu.com/ubuntu/pool/main/t/tomcat7/tomcat7_7.0.52-1ubuntu0.3_all.deb \ -http://archive.ubuntu.com/ubuntu/pool/main/a/authbind/authbind_2.1.1_amd64.deb - +#download_package http://nova.clouds.archive.ubuntu.com/ubuntu/pool/main/liba/libasyncns/libasyncns0_0.8-4ubuntu2_amd64.deb \ +#http://nova.clouds.archive.ubuntu.com/ubuntu/pool/main/a/avahi/libavahi-common-data_0.6.31-4ubuntu1_amd64.deb \ +#http://nova.clouds.archive.ubuntu.com/ubuntu/pool/main/a/avahi/libavahi-common3_0.6.31-4ubuntu1_amd64.deb \ +#http://nova.clouds.archive.ubuntu.com/ubuntu/pool/main/a/avahi/libavahi-client3_0.6.31-4ubuntu1_amd64.deb \ +#http://nova.clouds.archive.ubuntu.com/ubuntu/pool/main/c/cups/libcups2_1.7.2-0ubuntu1.7_amd64.deb \ +#http://nova.clouds.archive.ubuntu.com/ubuntu/pool/main/libo/libogg/libogg0_1.3.1-1ubuntu1_amd64.deb \ +#http://nova.clouds.archive.ubuntu.com/ubuntu/pool/main/f/flac/libflac8_1.3.0-2ubuntu0.14.04.1_amd64.deb \ +#http://nova.clouds.archive.ubuntu.com/ubuntu/pool/main/f/fonts-dejavu/fonts-dejavu-core_2.34-1ubuntu1_all.deb \ +#http://nova.clouds.archive.ubuntu.com/ubuntu/pool/main/f/fontconfig/fontconfig-config_2.11.0-0ubuntu4.1_all.deb \ +#http://nova.clouds.archive.ubuntu.com/ubuntu/pool/main/f/fontconfig/libfontconfig1_2.11.0-0ubuntu4.1_amd64.deb \ +#http://nova.clouds.archive.ubuntu.com/ubuntu/pool/main/libj/libjpeg-turbo/libjpeg-turbo8_1.3.0-0ubuntu2_amd64.deb \ +#http://nova.clouds.archive.ubuntu.com/ubuntu/pool/main/l/lcms2/liblcms2-2_2.5-0ubuntu4_amd64.deb \ +#http://nova.clouds.archive.ubuntu.com/ubuntu/pool/main/n/nspr/libnspr4_4.10.10-0ubuntu0.14.04.1_amd64.deb \ +#http://nova.clouds.archive.ubuntu.com/ubuntu/pool/main/n/nss/libnss3-nssdb_3.19.2.1-0ubuntu0.14.04.2_all.deb \ +#http://nova.clouds.archive.ubuntu.com/ubuntu/pool/main/n/nss/libnss3_3.19.2.1-0ubuntu0.14.04.2_amd64.deb \ +#http://nova.clouds.archive.ubuntu.com/ubuntu/pool/main/p/pcsc-lite/libpcsclite1_1.8.10-1ubuntu1_amd64.deb \ +#http://nova.clouds.archive.ubuntu.com/ubuntu/pool/main/libv/libvorbis/libvorbis0a_1.3.2-1.3ubuntu1_amd64.deb \ +#http://nova.clouds.archive.ubuntu.com/ubuntu/pool/main/libv/libvorbis/libvorbisenc2_1.3.2-1.3ubuntu1_amd64.deb \ +#http://nova.clouds.archive.ubuntu.com/ubuntu/pool/main/libs/libsndfile/libsndfile1_1.0.25-7ubuntu2.1_amd64.deb \ +#http://nova.clouds.archive.ubuntu.com/ubuntu/pool/main/p/pulseaudio/libpulse0_4.0-0ubuntu11.1_amd64.deb \ +#http://nova.clouds.archive.ubuntu.com/ubuntu/pool/main/l/lksctp-tools/libsctp1_1.0.15+dfsg-1_amd64.deb \ +#http://nova.clouds.archive.ubuntu.com/ubuntu/pool/main/j/java-common/java-common_0.51_all.deb \ +#http://nova.clouds.archive.ubuntu.com/ubuntu/pool/main/j/java-common/default-jre-headless_1.7-51_amd64.deb \ +#http://nova.clouds.archive.ubuntu.com/ubuntu/pool/main/c/ca-certificates-java/ca-certificates-java_20130815ubuntu1_all.deb \ +#http://nova.clouds.archive.ubuntu.com/ubuntu/pool/main/t/tzdata/tzdata_2015g-0ubuntu0.14.04_all.deb \ +#http://nova.clouds.archive.ubuntu.com/ubuntu/pool/main/t/tzdata/tzdata-java_2015g-0ubuntu0.14.04_all.deb \ +#http://nova.clouds.archive.ubuntu.com/ubuntu/pool/main/libj/libjpeg8-empty/libjpeg8_8c-2ubuntu8_amd64.deb \ +#http://nova.clouds.archive.ubuntu.com/ubuntu/pool/main/o/openjdk-7/openjdk-7-jre-headless_7u95-2.6.4-0ubuntu0.14.04.1_amd64.deb \ +#http://nova.clouds.archive.ubuntu.com/ubuntu/pool/main/libc/libcommons-collections3-java/libcommons-collections3-java_3.2.1-6_all.deb \ +#http://nova.clouds.archive.ubuntu.com/ubuntu/pool/main/c/commons-pool/libcommons-pool-java_1.6-2_all.deb \ +#http://nova.clouds.archive.ubuntu.com/ubuntu/pool/main/libc/libcommons-dbcp-java/libcommons-dbcp-java_1.4-3ubuntu1_all.deb \ +#http://nova.clouds.archive.ubuntu.com/ubuntu/pool/main/e/ecj/libecj-java_3.9.0-1_all.deb \ +#http://nova.clouds.archive.ubuntu.com/ubuntu/pool/main/g/geronimo-jta-1.1-spec/libgeronimo-jta-1.1-spec-java_1.1.1-3ubuntu1_all.deb \ +#http://nova.clouds.archive.ubuntu.com/ubuntu/pool/main/t/tomcat7/libservlet3.0-java_7.0.52-1ubuntu0.3_all.deb \ +#http://nova.clouds.archive.ubuntu.com/ubuntu/pool/main/t/tomcat7/libtomcat7-java_7.0.52-1ubuntu0.3_all.deb \ +#http://nova.clouds.archive.ubuntu.com/ubuntu/pool/main/l/lksctp-tools/lksctp-tools_1.0.15+dfsg-1_amd64.deb \ +#http://nova.clouds.archive.ubuntu.com/ubuntu/pool/main/t/tomcat7/tomcat7-common_7.0.52-1ubuntu0.3_all.deb \ +#http://nova.clouds.archive.ubuntu.com/ubuntu/pool/main/t/tomcat7/tomcat7_7.0.52-1ubuntu0.3_all.deb \ +#http://nova.clouds.archive.ubuntu.com/ubuntu/pool/main/a/authbind/authbind_2.1.1_amd64.deb # Additional dependencies -download_package http://archive.ubuntu.com/ubuntu/pool/main/u/unzip/unzip_6.0-9ubuntu1.4_amd64.deb +#download_package http://nova.clouds.archive.ubuntu.com/ubuntu/pool/main/a/autogen/libopts25_5.18-2ubuntu2_amd64.deb \ +#http://nova.clouds.archive.ubuntu.com/ubuntu/pool/main/n/ntp/ntp_4.2.6.p5+dfsg-3ubuntu2.14.04.6_amd64.deb \ +#http://nova.clouds.archive.ubuntu.com/ubuntu/pool/main/u/unzip/unzip_6.0-9ubuntu1.5_amd64.deb + +# Java 8 +download_package http://ppa.launchpad.net/openjdk-r/ppa/ubuntu/pool/main/o/openjdk-8/openjdk-8-jre-headless_8u91-b14-0ubuntu4~14.04_amd64.deb \ +http://ppa.launchpad.net/openjdk-r/ppa/ubuntu/pool/main/o/openjdk-8/openjdk-8-jre_8u91-b14-0ubuntu4~14.04_amd64.deb \ +http://ppa.launchpad.net/openjdk-r/ppa/ubuntu/pool/main/o/openjdk-8/openjdk-8-jdk-headless_8u91-b14-0ubuntu4~14.04_amd64.deb \ +http://ppa.launchpad.net/openjdk-r/ppa/ubuntu/pool/main/o/openjdk-8/openjdk-8-jdk_8u91-b14-0ubuntu4~14.04_amd64.deb \ +http://archive.ubuntu.com/ubuntu/pool/main/a/alsa-lib/libasound2-data_1.0.27.2-3ubuntu7_all.deb \ +http://archive.ubuntu.com/ubuntu/pool/main/a/alsa-lib/libasound2_1.0.27.2-3ubuntu7_amd64.deb \ +http://archive.ubuntu.com/ubuntu/pool/main/liba/libasyncns/libasyncns0_0.8-4ubuntu2_amd64.deb \ +http://archive.ubuntu.com/ubuntu/pool/main/liba/libatasmart/libatasmart4_0.19-3_amd64.deb \ +http://archive.ubuntu.com/ubuntu/pool/main/a/atk1.0/libatk1.0-data_2.10.0-2ubuntu2_all.deb \ +http://archive.ubuntu.com/ubuntu/pool/main/a/atk1.0/libatk1.0-0_2.10.0-2ubuntu2_amd64.deb \ +http://archive.ubuntu.com/ubuntu/pool/main/a/at-spi2-core/libatspi2.0-0_2.10.2.is.2.10.1-0ubuntu1_amd64.deb \ +http://archive.ubuntu.com/ubuntu/pool/main/a/at-spi2-atk/libatk-bridge2.0-0_2.10.2-2ubuntu1_amd64.deb \ +http://archive.ubuntu.com/ubuntu/pool/main/g/gtk+2.0/libgtk2.0-common_2.24.23-0ubuntu1.4_all.deb \ +http://archive.ubuntu.com/ubuntu/pool/main/f/fonts-dejavu/fonts-dejavu-core_2.34-1ubuntu1_all.deb \ +http://archive.ubuntu.com/ubuntu/pool/main/f/fontconfig/fontconfig-config_2.11.0-0ubuntu4.1_all.deb \ +http://archive.ubuntu.com/ubuntu/pool/main/f/fontconfig/libfontconfig1_2.11.0-0ubuntu4.1_amd64.deb \ +http://archive.ubuntu.com/ubuntu/pool/main/p/pixman/libpixman-1-0_0.30.2-2ubuntu1.1_amd64.deb \ +http://archive.ubuntu.com/ubuntu/pool/main/libx/libxcb/libxcb-render0_1.10-2ubuntu1_amd64.deb \ +http://archive.ubuntu.com/ubuntu/pool/main/libx/libxcb/libxcb-shm0_1.10-2ubuntu1_amd64.deb \ +http://archive.ubuntu.com/ubuntu/pool/main/libx/libxrender/libxrender1_0.9.8-1build0.14.04.1_amd64.deb \ +http://archive.ubuntu.com/ubuntu/pool/main/c/cairo/libcairo2_1.13.0~20140204-0ubuntu1.1_amd64.deb \ +http://archive.ubuntu.com/ubuntu/pool/main/a/avahi/libavahi-common-data_0.6.31-4ubuntu1_amd64.deb \ +http://archive.ubuntu.com/ubuntu/pool/main/a/avahi/libavahi-common3_0.6.31-4ubuntu1_amd64.deb \ +http://archive.ubuntu.com/ubuntu/pool/main/a/avahi/libavahi-client3_0.6.31-4ubuntu1_amd64.deb \ +http://archive.ubuntu.com/ubuntu/pool/main/c/cups/libcups2_1.7.2-0ubuntu1.7_amd64.deb \ +http://archive.ubuntu.com/ubuntu/pool/main/libj/libjpeg-turbo/libjpeg-turbo8_1.3.0-0ubuntu2_amd64.deb \ +http://archive.ubuntu.com/ubuntu/pool/main/libj/libjpeg8-empty/libjpeg8_8c-2ubuntu8_amd64.deb \ +http://archive.ubuntu.com/ubuntu/pool/main/j/jasper/libjasper1_1.900.1-14ubuntu3.3_amd64.deb \ +http://archive.ubuntu.com/ubuntu/pool/main/j/jbigkit/libjbig0_2.0-2ubuntu4.1_amd64.deb \ +http://archive.ubuntu.com/ubuntu/pool/main/t/tiff/libtiff5_4.0.3-7ubuntu0.4_amd64.deb \ +http://archive.ubuntu.com/ubuntu/pool/main/g/gdk-pixbuf/libgdk-pixbuf2.0-common_2.30.7-0ubuntu1.2_all.deb \ +http://archive.ubuntu.com/ubuntu/pool/main/g/gdk-pixbuf/libgdk-pixbuf2.0-0_2.30.7-0ubuntu1.2_amd64.deb \ +http://archive.ubuntu.com/ubuntu/pool/main/libt/libthai/libthai-data_0.1.20-3_all.deb \ +http://archive.ubuntu.com/ubuntu/pool/main/libd/libdatrie/libdatrie1_0.2.8-1_amd64.deb \ +http://archive.ubuntu.com/ubuntu/pool/main/libt/libthai/libthai0_0.1.20-3_amd64.deb \ +http://archive.ubuntu.com/ubuntu/pool/main/f/fontconfig/fontconfig_2.11.0-0ubuntu4.1_amd64.deb \ +http://archive.ubuntu.com/ubuntu/pool/main/p/pango1.0/libpango-1.0-0_1.36.3-1ubuntu1.1_amd64.deb \ +http://archive.ubuntu.com/ubuntu/pool/main/g/graphite2/libgraphite2-3_1.3.6-1ubuntu0.14.04.1_amd64.deb \ +http://archive.ubuntu.com/ubuntu/pool/main/h/harfbuzz/libharfbuzz0b_0.9.27-1ubuntu1_amd64.deb \ +http://archive.ubuntu.com/ubuntu/pool/main/p/pango1.0/libpangoft2-1.0-0_1.36.3-1ubuntu1.1_amd64.deb \ +http://archive.ubuntu.com/ubuntu/pool/main/p/pango1.0/libpangocairo-1.0-0_1.36.3-1ubuntu1.1_amd64.deb \ +http://archive.ubuntu.com/ubuntu/pool/main/libx/libxcomposite/libxcomposite1_0.4.4-1_amd64.deb \ +http://archive.ubuntu.com/ubuntu/pool/main/libx/libxfixes/libxfixes3_5.0.1-1ubuntu1.1_amd64.deb \ +http://archive.ubuntu.com/ubuntu/pool/main/libx/libxcursor/libxcursor1_1.1.14-1_amd64.deb \ +http://archive.ubuntu.com/ubuntu/pool/main/libx/libxdamage/libxdamage1_1.1.4-1ubuntu1_amd64.deb \ +http://archive.ubuntu.com/ubuntu/pool/main/libx/libxi/libxi6_1.7.1.901-1ubuntu1.1_amd64.deb \ +http://archive.ubuntu.com/ubuntu/pool/main/libx/libxinerama/libxinerama1_1.1.3-1_amd64.deb \ +http://archive.ubuntu.com/ubuntu/pool/main/libx/libxrandr/libxrandr2_1.4.2-1_amd64.deb \ +http://archive.ubuntu.com/ubuntu/pool/main/g/gtk+2.0/libgtk2.0-0_2.24.23-0ubuntu1.4_amd64.deb \ +http://archive.ubuntu.com/ubuntu/pool/main/n/nspr/libnspr4_4.10.10-0ubuntu0.14.04.1_amd64.deb \ +http://archive.ubuntu.com/ubuntu/pool/main/n/nss/libnss3-nssdb_3.21-0ubuntu0.14.04.2_all.deb \ +http://archive.ubuntu.com/ubuntu/pool/main/n/nss/libnss3_3.21-0ubuntu0.14.04.2_amd64.deb \ +http://archive.ubuntu.com/ubuntu/pool/main/c/ca-certificates-java/ca-certificates-java_20130815ubuntu1_all.deb \ +http://archive.ubuntu.com/ubuntu/pool/main/j/java-common/java-common_0.51_all.deb \ +http://archive.ubuntu.com/ubuntu/pool/main/l/lcms2/liblcms2-2_2.5-0ubuntu4.1_amd64.deb \ +http://archive.ubuntu.com/ubuntu/pool/main/p/pcsc-lite/libpcsclite1_1.8.10-1ubuntu1_amd64.deb \ +http://archive.ubuntu.com/ubuntu/pool/main/x/xorg/x11-common_7.7+1ubuntu8.1_all.deb \ +http://archive.ubuntu.com/ubuntu/pool/main/libx/libxtst/libxtst6_1.2.2-1_amd64.deb \ +http://archive.ubuntu.com/ubuntu/pool/main/m/mesa/libglapi-mesa_10.1.3-0ubuntu0.6_amd64.deb \ +http://archive.ubuntu.com/ubuntu/pool/main/libx/libx11/libx11-xcb1_1.6.2-1ubuntu2_amd64.deb \ +http://archive.ubuntu.com/ubuntu/pool/main/libx/libxcb/libxcb-dri2-0_1.10-2ubuntu1_amd64.deb \ +http://archive.ubuntu.com/ubuntu/pool/main/libx/libxcb/libxcb-dri3-0_1.10-2ubuntu1_amd64.deb \ +http://archive.ubuntu.com/ubuntu/pool/main/libx/libxcb/libxcb-glx0_1.10-2ubuntu1_amd64.deb \ +http://archive.ubuntu.com/ubuntu/pool/main/libx/libxcb/libxcb-present0_1.10-2ubuntu1_amd64.deb \ +http://archive.ubuntu.com/ubuntu/pool/main/libx/libxcb/libxcb-sync1_1.10-2ubuntu1_amd64.deb \ +http://archive.ubuntu.com/ubuntu/pool/main/libx/libxshmfence/libxshmfence1_1.1-2_amd64.deb \ +http://archive.ubuntu.com/ubuntu/pool/main/libx/libxxf86vm/libxxf86vm1_1.1.3-1_amd64.deb \ +http://archive.ubuntu.com/ubuntu/pool/main/m/mesa/libgl1-mesa-glx_10.1.3-0ubuntu0.6_amd64.deb \ +http://archive.ubuntu.com/ubuntu/pool/main/g/giflib/libgif4_4.1.6-11_amd64.deb \ +http://archive.ubuntu.com/ubuntu/pool/main/libo/libogg/libogg0_1.3.1-1ubuntu1_amd64.deb \ +http://archive.ubuntu.com/ubuntu/pool/main/f/flac/libflac8_1.3.0-2ubuntu0.14.04.1_amd64.deb \ +http://archive.ubuntu.com/ubuntu/pool/main/libv/libvorbis/libvorbis0a_1.3.2-1.3ubuntu1_amd64.deb \ +http://archive.ubuntu.com/ubuntu/pool/main/libv/libvorbis/libvorbisenc2_1.3.2-1.3ubuntu1_amd64.deb \ +http://archive.ubuntu.com/ubuntu/pool/main/libs/libsndfile/libsndfile1_1.0.25-7ubuntu2.1_amd64.deb \ +http://archive.ubuntu.com/ubuntu/pool/main/p/pulseaudio/libpulse0_4.0-0ubuntu11.1_amd64.deb \ +http://archive.ubuntu.com/ubuntu/pool/main/j/java-atk-wrapper/libatk-wrapper-java_0.30.4-4_all.deb \ +http://archive.ubuntu.com/ubuntu/pool/main/j/java-atk-wrapper/libatk-wrapper-java-jni_0.30.4-4_amd64.deb \ +http://archive.ubuntu.com/ubuntu/pool/main/a/avahi/libavahi-glib1_0.6.31-4ubuntu1_amd64.deb \ +http://archive.ubuntu.com/ubuntu/pool/main/libb/libbonobo/libbonobo2-common_2.32.1-0ubuntu5_all.deb \ +http://archive.ubuntu.com/ubuntu/pool/main/libi/libidl/libidl-common_0.8.14-0.2ubuntu4_all.deb \ +http://archive.ubuntu.com/ubuntu/pool/main/libi/libidl/libidl0_0.8.14-0.2ubuntu4_amd64.deb \ +http://archive.ubuntu.com/ubuntu/pool/main/o/orbit2/liborbit-2-0_2.14.19-0.3_amd64.deb \ +http://archive.ubuntu.com/ubuntu/pool/main/o/orbit2/liborbit2_2.14.19-0.3_amd64.deb \ +http://archive.ubuntu.com/ubuntu/pool/main/libb/libbonobo/libbonobo2-0_2.32.1-0ubuntu5_amd64.deb \ +http://archive.ubuntu.com/ubuntu/pool/main/c/cairo/libcairo-gobject2_1.13.0~20140204-0ubuntu1.1_amd64.deb \ +http://archive.ubuntu.com/ubuntu/pool/main/libt/libtool/libltdl7_2.4.2-1.7ubuntu1_amd64.deb \ +http://archive.ubuntu.com/ubuntu/pool/main/t/tdb/libtdb1_1.3.8-0ubuntu0.14.04.1_amd64.deb \ +http://archive.ubuntu.com/ubuntu/pool/main/libv/libvorbis/libvorbisfile3_1.3.2-1.3ubuntu1_amd64.deb \ +http://archive.ubuntu.com/ubuntu/pool/main/s/sound-theme-freedesktop/sound-theme-freedesktop_0.8-1_all.deb \ +http://archive.ubuntu.com/ubuntu/pool/main/libc/libcanberra/libcanberra0_0.30-0ubuntu3_amd64.deb \ +http://archive.ubuntu.com/ubuntu/pool/main/c/colord/libcolord1_1.0.6-1_amd64.deb \ +http://archive.ubuntu.com/ubuntu/pool/main/d/d-conf/libdconf1_0.20.0-1_amd64.deb \ +http://archive.ubuntu.com/ubuntu/pool/main/libp/libpciaccess/libpciaccess0_0.13.2-1_amd64.deb \ +http://archive.ubuntu.com/ubuntu/pool/main/libd/libdrm/libdrm-intel1_2.4.64-1~ubuntu14.04.1_amd64.deb \ +http://archive.ubuntu.com/ubuntu/pool/main/libd/libdrm/libdrm-nouveau2_2.4.64-1~ubuntu14.04.1_amd64.deb \ +http://archive.ubuntu.com/ubuntu/pool/main/libd/libdrm/libdrm-radeon1_2.4.64-1~ubuntu14.04.1_amd64.deb \ +http://archive.ubuntu.com/ubuntu/pool/main/libe/libexif/libexif12_0.6.21-1ubuntu1_amd64.deb \ +http://archive.ubuntu.com/ubuntu/pool/main/libf/libfontenc/libfontenc1_1.1.2-1_amd64.deb \ +http://archive.ubuntu.com/ubuntu/pool/main/g/gconf/gconf2-common_3.2.6-0ubuntu2_all.deb \ +http://archive.ubuntu.com/ubuntu/pool/main/g/gconf/libgconf-2-4_3.2.6-0ubuntu2_amd64.deb \ +http://archive.ubuntu.com/ubuntu/pool/main/libv/libvpx/libvpx1_1.3.0-2_amd64.deb \ +http://archive.ubuntu.com/ubuntu/pool/main/libx/libxpm/libxpm4_3.5.10-1_amd64.deb \ +http://archive.ubuntu.com/ubuntu/pool/main/libg/libgd2/libgd3_2.1.0-3_amd64.deb \ +http://archive.ubuntu.com/ubuntu/pool/main/l/llvm-toolchain-3.4/libllvm3.4_3.4-1ubuntu3_amd64.deb \ +http://archive.ubuntu.com/ubuntu/pool/main/m/mesa/libgl1-mesa-dri_10.1.3-0ubuntu0.6_amd64.deb \ +http://archive.ubuntu.com/ubuntu/pool/main/g/gconf/gconf-service-backend_3.2.6-0ubuntu2_amd64.deb \ +http://archive.ubuntu.com/ubuntu/pool/main/g/gconf/gconf-service_3.2.6-0ubuntu2_amd64.deb \ +http://archive.ubuntu.com/ubuntu/pool/main/d/dbus/dbus-x11_1.6.18-0ubuntu4.3_amd64.deb \ +http://archive.ubuntu.com/ubuntu/pool/main/g/gconf/gconf2_3.2.6-0ubuntu2_amd64.deb \ +http://archive.ubuntu.com/ubuntu/pool/main/g/gnome-vfs/libgnomevfs2-common_2.24.4-1ubuntu6_amd64.deb \ +http://archive.ubuntu.com/ubuntu/pool/main/g/gnome-vfs/libgnomevfs2-0_2.24.4-1ubuntu6_amd64.deb \ +http://archive.ubuntu.com/ubuntu/pool/main/libg/libgnome/libgnome2-common_2.32.1-4ubuntu1_all.deb \ +http://archive.ubuntu.com/ubuntu/pool/main/libg/libgnome/libgnome2-bin_2.32.1-4ubuntu1_amd64.deb \ +http://archive.ubuntu.com/ubuntu/pool/main/libg/libgnome/libgnome2-0_2.32.1-4ubuntu1_amd64.deb \ +http://archive.ubuntu.com/ubuntu/pool/main/libg/libgphoto2/libgphoto2-port10_2.5.3.1-1ubuntu2.2_amd64.deb \ +http://archive.ubuntu.com/ubuntu/pool/main/libg/libgphoto2/libgphoto2-6_2.5.3.1-1ubuntu2.2_amd64.deb \ +http://archive.ubuntu.com/ubuntu/pool/main/d/d-conf/dconf-service_0.20.0-1_amd64.deb \ +http://archive.ubuntu.com/ubuntu/pool/main/d/d-conf/dconf-gsettings-backend_0.20.0-1_amd64.deb \ +http://archive.ubuntu.com/ubuntu/pool/main/g/gtk+3.0/libgtk-3-common_3.10.8-0ubuntu1.6_all.deb \ +http://archive.ubuntu.com/ubuntu/pool/main/w/wayland/libwayland-client0_1.4.0-1ubuntu1_amd64.deb \ +http://archive.ubuntu.com/ubuntu/pool/main/w/wayland/libwayland-cursor0_1.4.0-1ubuntu1_amd64.deb \ +http://archive.ubuntu.com/ubuntu/pool/main/libx/libxkbcommon/libxkbcommon0_0.4.1-0ubuntu1_amd64.deb \ +http://archive.ubuntu.com/ubuntu/pool/main/g/gtk+3.0/libgtk-3-0_3.10.8-0ubuntu1.6_amd64.deb \ +http://archive.ubuntu.com/ubuntu/pool/main/s/systemd/libgudev-1.0-0_204-5ubuntu20.19_amd64.deb \ +http://archive.ubuntu.com/ubuntu/pool/main/libi/libice/libice6_1.0.8-2_amd64.deb \ +http://archive.ubuntu.com/ubuntu/pool/main/libi/libieee1284/libieee1284-3_0.2.11-12_amd64.deb \ +http://archive.ubuntu.com/ubuntu/pool/main/p/policykit-1/libpolkit-agent-1-0_0.105-4ubuntu3.14.04.1_amd64.deb \ +http://archive.ubuntu.com/ubuntu/pool/main/p/policykit-1/libpolkit-backend-1-0_0.105-4ubuntu3.14.04.1_amd64.deb \ +http://archive.ubuntu.com/ubuntu/pool/main/s/sane-backends/libsane-common_1.0.23-3ubuntu3.1_amd64.deb \ +http://archive.ubuntu.com/ubuntu/pool/main/v/v4l-utils/libv4lconvert0_1.0.1-1_amd64.deb \ +http://archive.ubuntu.com/ubuntu/pool/main/v/v4l-utils/libv4l-0_1.0.1-1_amd64.deb \ +http://archive.ubuntu.com/ubuntu/pool/main/s/sane-backends/libsane_1.0.23-3ubuntu3.1_amd64.deb \ +http://archive.ubuntu.com/ubuntu/pool/main/libs/libsecret/libsecret-common_0.16-0ubuntu1_all.deb \ +http://archive.ubuntu.com/ubuntu/pool/main/libs/libsecret/libsecret-1-0_0.16-0ubuntu1_amd64.deb \ +http://archive.ubuntu.com/ubuntu/pool/main/libs/libsm/libsm6_1.2.1-2_amd64.deb \ +http://archive.ubuntu.com/ubuntu/pool/main/u/udisks2/libudisks2-0_2.1.3-1ubuntu0.1_amd64.deb \ +http://archive.ubuntu.com/ubuntu/pool/main/libx/libxt/libxt6_1.1.4-1_amd64.deb \ +http://archive.ubuntu.com/ubuntu/pool/main/libx/libxmu/libxmu6_1.1.1-1_amd64.deb \ +http://archive.ubuntu.com/ubuntu/pool/main/libx/libxaw/libxaw7_1.0.12-1_amd64.deb \ +http://archive.ubuntu.com/ubuntu/pool/main/libx/libxcb/libxcb-shape0_1.10-2ubuntu1_amd64.deb \ +http://archive.ubuntu.com/ubuntu/pool/main/x/xft/libxft2_2.3.1-2_amd64.deb \ +http://archive.ubuntu.com/ubuntu/pool/main/libx/libxv/libxv1_1.0.10-1_amd64.deb \ +http://archive.ubuntu.com/ubuntu/pool/main/libx/libxxf86dga/libxxf86dga1_1.1.4-1_amd64.deb \ +http://archive.ubuntu.com/ubuntu/pool/main/libg/libgusb/libgusb2_0.1.6-5_amd64.deb \ +http://archive.ubuntu.com/ubuntu/pool/main/c/colord/libcolorhug1_1.0.6-1_amd64.deb \ +http://archive.ubuntu.com/ubuntu/pool/main/s/s2tc/libtxc-dxtn-s2tc0_0~git20131104-1.1_amd64.deb \ +http://archive.ubuntu.com/ubuntu/pool/main/a/at-spi2-core/at-spi2-core_2.10.2.is.2.10.1-0ubuntu1_amd64.deb \ +http://archive.ubuntu.com/ubuntu/pool/main/p/policykit-1/policykit-1_0.105-4ubuntu3.14.04.1_amd64.deb \ +http://archive.ubuntu.com/ubuntu/pool/main/c/colord/colord_1.0.6-1_amd64.deb \ +http://archive.ubuntu.com/ubuntu/pool/main/d/desktop-file-utils/desktop-file-utils_0.22-1ubuntu1_amd64.deb \ +http://archive.ubuntu.com/ubuntu/pool/main/f/fonts-dejavu/fonts-dejavu-extra_2.34-1ubuntu1_all.deb \ +http://archive.ubuntu.com/ubuntu/pool/main/x/x11-utils/x11-utils_7.7+1_amd64.deb \ +http://archive.ubuntu.com/ubuntu/pool/main/u/udisks2/udisks2_2.1.3-1ubuntu0.1_amd64.deb \ +http://archive.ubuntu.com/ubuntu/pool/main/g/gvfs/gvfs-common_1.20.3-0ubuntu1.2_all.deb \ +http://archive.ubuntu.com/ubuntu/pool/main/g/gvfs/gvfs-libs_1.20.3-0ubuntu1.2_amd64.deb \ +http://archive.ubuntu.com/ubuntu/pool/main/g/gvfs/gvfs-daemons_1.20.3-0ubuntu1.2_amd64.deb \ +http://archive.ubuntu.com/ubuntu/pool/main/g/gvfs/gvfs_1.20.3-0ubuntu1.2_amd64.deb \ +http://archive.ubuntu.com/ubuntu/pool/main/h/hicolor-icon-theme/hicolor-icon-theme_0.13-1_all.deb \ +http://archive.ubuntu.com/ubuntu/pool/main/g/gconf/libgconf2-4_3.2.6-0ubuntu2_amd64.deb \ +http://archive.ubuntu.com/ubuntu/pool/main/libg/libgphoto2/libgphoto2-l10n_2.5.3.1-1ubuntu2.2_all.deb \ +http://archive.ubuntu.com/ubuntu/pool/main/g/gtk+3.0/libgtk-3-bin_3.10.8-0ubuntu1.6_amd64.deb \ +http://archive.ubuntu.com/ubuntu/pool/main/g/gtk+2.0/libgtk2.0-bin_2.24.23-0ubuntu1.4_amd64.deb \ +http://archive.ubuntu.com/ubuntu/pool/main/x/xorg-sgml-doctools/xorg-sgml-doctools_1.11-1_all.deb \ +http://archive.ubuntu.com/ubuntu/pool/main/x/x11proto-core/x11proto-core-dev_7.0.26-1~ubuntu2_all.deb \ +http://archive.ubuntu.com/ubuntu/pool/main/libi/libice/libice-dev_1.0.8-2_amd64.deb \ +http://archive.ubuntu.com/ubuntu/pool/main/libp/libpthread-stubs/libpthread-stubs0-dev_0.3-4_amd64.deb \ +http://archive.ubuntu.com/ubuntu/pool/main/libs/libsm/libsm-dev_1.2.1-2_amd64.deb \ +http://archive.ubuntu.com/ubuntu/pool/main/libx/libxau/libxau-dev_1.0.8-1_amd64.deb \ +http://archive.ubuntu.com/ubuntu/pool/main/libx/libxdmcp/libxdmcp-dev_1.1.1-1_amd64.deb \ +http://archive.ubuntu.com/ubuntu/pool/main/x/x11proto-input/x11proto-input-dev_2.3-1_all.deb \ +http://archive.ubuntu.com/ubuntu/pool/main/x/x11proto-kb/x11proto-kb-dev_1.0.6-2_all.deb \ +http://archive.ubuntu.com/ubuntu/pool/main/x/xtrans/xtrans-dev_1.3.5-1~ubuntu14.04.1_all.deb \ +http://archive.ubuntu.com/ubuntu/pool/main/libx/libxcb/libxcb1-dev_1.10-2ubuntu1_amd64.deb \ +http://archive.ubuntu.com/ubuntu/pool/main/libx/libx11/libx11-dev_1.6.2-1ubuntu2_amd64.deb \ +http://archive.ubuntu.com/ubuntu/pool/main/libx/libx11/libx11-doc_1.6.2-1ubuntu2_all.deb \ +http://archive.ubuntu.com/ubuntu/pool/main/libx/libxt/libxt-dev_1.1.4-1_amd64.deb \ +http://archive.ubuntu.com/ubuntu/pool/main/p/policykit-1-gnome/policykit-1-gnome_0.105-1ubuntu4_amd64.deb + +# Install puppet manifests +download_puppet_module "apt" "$APT_TARBALL_URL" +download_puppet_module "stdlib" "$STDLIB_TARBALL_URL" +download_puppet_module "mariadbrepo" "$MARIADBREPO_TARBALL_URL" diff --git a/specs/openbook-plugin.rst b/specs/openbook-plugin.rst index 10530ae..542a31b 100644 --- a/specs/openbook-plugin.rst +++ b/specs/openbook-plugin.rst @@ -5,7 +5,7 @@ http://creativecommons.org/licenses/by/3.0/legalcode =================================================== -Guide to the Openbook Plugin version 1.1.0 for Fuel +Guide to the Openbook Plugin version 1.3.0 for Fuel =================================================== This plugin extends Mirantis OpenStack functionality by adding Openbook customer @@ -131,7 +131,7 @@ Work Items Dependencies ============ -* Fuel 7.0 +* Fuel 8.0 * Talligent Sharefile access Testing diff --git a/tasks.yaml b/tasks.yaml index 6b4accb..fe51488 100644 --- a/tasks.yaml +++ b/tasks.yaml @@ -1,23 +1 @@ -- role: ['openbook'] - stage: post_deployment/8000 - type: puppet - parameters: - puppet_manifest: puppet/manifests/check_environment_configuration.pp - puppet_modules: puppet/modules - timeout: 300 - -- role: ['openbook'] - stage: post_deployment/8900 - type: puppet - parameters: - puppet_manifest: puppet/manifests/deploy.pp - puppet_modules: puppet/modules - timeout: 1500 -- role: ['openbook'] - stage: post_deployment/8900 - type: puppet - parameters: - puppet_manifest: puppet/manifests/finalize.pp - puppet_modules: puppet/modules - timeout: 300 - +[]