diff options
| -rw-r--r-- | README.md | 9 | ||||
| -rw-r--r-- | manifests/profile/base/ironic/conductor.pp | 1 | ||||
| -rw-r--r-- | manifests/profile/pacemaker/cinder/backup_bundle.pp | 146 | ||||
| -rw-r--r-- | manifests/profile/pacemaker/cinder/volume_bundle.pp | 141 | ||||
| -rw-r--r-- | manifests/ui.pp | 39 | ||||
| -rw-r--r-- | releasenotes/notes/add-support-for-proxying-ironic-inspector-via-apache-ea70e9fa1ad04553.yaml | 6 | ||||
| -rw-r--r-- | templates/ui/tripleo_ui_config.js.erb | 1 |
7 files changed, 331 insertions, 12 deletions
@@ -8,3 +8,12 @@ Team and repository tags # puppet-tripleo Lightweight composition layer for Puppet TripleO. + +## Contributing + +* Free software: Apache licence +* Source: http://git.openstack.org/cgit/openstack/puppet-tripleo +* Bugs: http://bugs.launchpad.net/tripleo (tag: puppet) +* Documentation: + * TripleO: http://docs.openstack.org/developer/tripleo-docs/index.html + * Testing with puppet: https://docs.openstack.org/developer/puppet-openstack-guide/testing.html diff --git a/manifests/profile/base/ironic/conductor.pp b/manifests/profile/base/ironic/conductor.pp index 5ebf167..f7a2eb0 100644 --- a/manifests/profile/base/ironic/conductor.pp +++ b/manifests/profile/base/ironic/conductor.pp @@ -51,6 +51,7 @@ class tripleo::profile::base::ironic::conductor ( } # Configure access to other services + include ::ironic::cinder include ::ironic::drivers::inspector include ::ironic::glance include ::ironic::neutron diff --git a/manifests/profile/pacemaker/cinder/backup_bundle.pp b/manifests/profile/pacemaker/cinder/backup_bundle.pp new file mode 100644 index 0000000..cd06986 --- /dev/null +++ b/manifests/profile/pacemaker/cinder/backup_bundle.pp @@ -0,0 +1,146 @@ +# Copyright 2017 Red Hat, Inc. +# +# Licensed under the Apache License, Version 2.0 (the "License"); you may +# not use this file except in compliance with the License. You may obtain +# a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT +# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the +# License for the specific language governing permissions and limitations +# under the License. +# +# == Class: tripleo::profile::pacemaker::cinder::backup_bundle +# +# Containerized Redis Pacemaker HA profile for tripleo +# +# === Parameters +# +# [*cinder_backup_docker_image*] +# (Optional) The docker image to use for creating the pacemaker bundle +# Defaults to hiera('tripleo::profile::pacemaker::cinder::backup_bundle::cinder_docker_image', undef) +# +# [*pcs_tries*] +# (Optional) The number of times pcs commands should be retried. +# Defaults to hiera('pcs_tries', 20) +# +# [*bootstrap_node*] +# (Optional) The hostname of the node responsible for bootstrapping tasks +# Defaults to hiera('redis_short_bootstrap_node_name') +# +# [*step*] +# (Optional) The current step in deployment. See tripleo-heat-templates +# for more details. +# Defaults to hiera('step') +# +# +class tripleo::profile::pacemaker::cinder::backup_bundle ( + $bootstrap_node = hiera('cinder_backup_short_bootstrap_node_name'), + $cinder_backup_docker_image = hiera('tripleo::profile::pacemaker::cinder::backup_bundle::cinder_backup_docker_image', undef), + $pcs_tries = hiera('pcs_tries', 20), + $step = hiera('step'), +) { + if $::hostname == downcase($bootstrap_node) { + $pacemaker_master = true + } else { + $pacemaker_master = false + } + + include ::tripleo::profile::base::cinder::backup + + if $step >= 2 and $pacemaker_master { + $cinder_backup_short_node_names = hiera('cinder_backup_short_node_names') + $cinder_backup_short_node_names.each |String $node_name| { + pacemaker::property { "cinder-backup-role-${node_name}": + property => 'cinder-backup-role', + value => true, + tries => $pcs_tries, + node => $node_name, + before => Pacemaker::Resource::Bundle[$::cinder::params::backup_service], + } + } + } + + if $step >= 5 { + if $pacemaker_master { + $cinder_backup_nodes_count = count(hiera('cinder_backup_short_node_names', [])) + + pacemaker::resource::bundle { $::cinder::params::backup_service : + image => $cinder_backup_docker_image, + replicas => 1, + location_rule => { + resource_discovery => 'exclusive', + score => 0, + expression => ['cinder-backup-role eq true'], + }, + container_options => 'network=host', + options => '--ipc=host --privileged=true --user=root --log-driver=journald -e KOLLA_CONFIG_STRATEGY=COPY_ALWAYS', + run_command => '/bin/bash /usr/local/bin/kolla_start', + storage_maps => { + 'cinder-backup-cfg-files' => { + 'source-dir' => '/var/lib/kolla/config_files/cinder_backup.json', + 'target-dir' => '/var/lib/kolla/config_files/config.json', + 'options' => 'ro', + }, + 'cinder-backup-cfg-data' => { + 'source-dir' => '/var/lib/config-data/cinder/etc/cinder', + 'target-dir' => '/etc/cinder', + 'options' => 'ro', + }, + 'cinder-backup-cfg-ceph' => { + 'source-dir' => '/var/lib/config-data/cinder/etc/ceph', + 'target-dir' => '/etc/ceph', + 'options' => 'ro', + }, + 'cinder-backup-hosts' => { + 'source-dir' => '/etc/hosts', + 'target-dir' => '/etc/hosts', + 'options' => 'ro', + }, + 'cinder-backup-localtime' => { + 'source-dir' => '/etc/localtime', + 'target-dir' => '/etc/localtime', + 'options' => 'ro', + }, + 'cinder-backup-dev' => { + 'source-dir' => '/dev', + 'target-dir' => '/dev', + 'options' => 'rw', + }, + 'cinder-backup-run' => { + 'source-dir' => '/run', + 'target-dir' => '/run', + 'options' => 'rw', + }, + 'cinder-backup-sys' => { + 'source-dir' => '/sys', + 'target-dir' => '/sys', + 'options' => 'rw', + }, + 'cinder-backup-lib-modules' => { + 'source-dir' => '/lib/modules', + 'target-dir' => '/lib/modules', + 'options' => 'ro', + }, + 'cinder-backup-iscsi' => { + 'source-dir' => '/etc/iscsi', + 'target-dir' => '/etc/iscsi', + 'options' => 'rw', + }, + 'cinder-backup-var-lib-cinder' => { + 'source-dir' => '/var/lib/cinder', + 'target-dir' => '/var/lib/cinder', + 'options' => 'rw', + }, + 'cinder-backup-var-log' => { + 'source-dir' => '/var/log/containers/cinder', + 'target-dir' => '/var/log/cinder', + 'options' => 'rw', + }, + }, + } + } + } +} diff --git a/manifests/profile/pacemaker/cinder/volume_bundle.pp b/manifests/profile/pacemaker/cinder/volume_bundle.pp new file mode 100644 index 0000000..f0858c9 --- /dev/null +++ b/manifests/profile/pacemaker/cinder/volume_bundle.pp @@ -0,0 +1,141 @@ +# Copyright 2017 Red Hat, Inc. +# +# Licensed under the Apache License, Version 2.0 (the "License"); you may +# not use this file except in compliance with the License. You may obtain +# a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT +# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the +# License for the specific language governing permissions and limitations +# under the License. +# +# == Class: tripleo::profile::pacemaker::cinder::volume_bundle +# +# Containerized Redis Pacemaker HA profile for tripleo +# +# === Parameters +# +# [*cinder_volume_docker_image*] +# (Optional) The docker image to use for creating the pacemaker bundle +# Defaults to hiera('tripleo::profile::pacemaker::cinder::volume_bundle::cinder_docker_image', undef) +# +# [*pcs_tries*] +# (Optional) The number of times pcs commands should be retried. +# Defaults to hiera('pcs_tries', 20) +# +# [*bootstrap_node*] +# (Optional) The hostname of the node responsible for bootstrapping tasks +# Defaults to hiera('redis_short_bootstrap_node_name') +# +# [*step*] +# (Optional) The current step in deployment. See tripleo-heat-templates +# for more details. +# Defaults to hiera('step') +# +# +class tripleo::profile::pacemaker::cinder::volume_bundle ( + $bootstrap_node = hiera('cinder_volume_short_bootstrap_node_name'), + $cinder_volume_docker_image = hiera('tripleo::profile::pacemaker::cinder::volume_bundle::cinder_volume_docker_image', undef), + $pcs_tries = hiera('pcs_tries', 20), + $step = hiera('step'), +) { + if $::hostname == downcase($bootstrap_node) { + $pacemaker_master = true + } else { + $pacemaker_master = false + } + + include ::tripleo::profile::base::cinder::volume + + if $step >= 2 and $pacemaker_master { + $cinder_volume_short_node_names = hiera('cinder_volume_short_node_names') + $cinder_volume_short_node_names.each |String $node_name| { + pacemaker::property { "cinder-volume-role-${node_name}": + property => 'cinder-volume-role', + value => true, + tries => $pcs_tries, + node => $node_name, + before => Pacemaker::Resource::Bundle[$::cinder::params::volume_service], + } + } + } + + if $step >= 5 { + if $pacemaker_master { + $cinder_volume_nodes_count = count(hiera('cinder_volume_short_node_names', [])) + + pacemaker::resource::bundle { $::cinder::params::volume_service: + image => $cinder_volume_docker_image, + replicas => 1, + location_rule => { + resource_discovery => 'exclusive', + score => 0, + expression => ['cinder-volume-role eq true'], + }, + container_options => 'network=host', + options => '--ipc=host --privileged=true --user=root --log-driver=journald -e KOLLA_CONFIG_STRATEGY=COPY_ALWAYS', + run_command => '/bin/bash /usr/local/bin/kolla_start', + storage_maps => { + 'cinder-volume-cfg-files' => { + 'source-dir' => '/var/lib/kolla/config_files/cinder_volume.json', + 'target-dir' => '/var/lib/kolla/config_files/config.json', + 'options' => 'ro', + }, + 'cinder-volume-cfg-data' => { + 'source-dir' => '/var/lib/config-data/cinder/etc/cinder', + 'target-dir' => '/etc/cinder', + 'options' => 'ro', + }, + 'cinder-volume-hosts' => { + 'source-dir' => '/etc/hosts', + 'target-dir' => '/etc/hosts', + 'options' => 'ro', + }, + 'cinder-volume-localtime' => { + 'source-dir' => '/etc/localtime', + 'target-dir' => '/etc/localtime', + 'options' => 'ro', + }, + 'cinder-volume-dev' => { + 'source-dir' => '/dev', + 'target-dir' => '/dev', + 'options' => 'rw', + }, + 'cinder-volume-run' => { + 'source-dir' => '/run', + 'target-dir' => '/run', + 'options' => 'rw', + }, + 'cinder-volume-sys' => { + 'source-dir' => '/sys', + 'target-dir' => '/sys', + 'options' => 'rw', + }, + 'cinder-volume-lib-modules' => { + 'source-dir' => '/lib/modules', + 'target-dir' => '/lib/modules', + 'options' => 'ro', + }, + 'cinder-volume-iscsi' => { + 'source-dir' => '/etc/iscsi', + 'target-dir' => '/etc/iscsi', + 'options' => 'rw', + }, + 'cinder-volume-var-lib-cinder' => { + 'source-dir' => '/var/lib/cinder', + 'target-dir' => '/var/lib/cinder', + 'options' => 'rw', + }, + 'cinder-volume-var-log' => { + 'source-dir' => '/var/log/containers/cinder', + 'target-dir' => '/var/log/cinder', + 'options' => 'rw', + }, + }, + } + } + } +} diff --git a/manifests/ui.pp b/manifests/ui.pp index 1745535..825ffc2 100644 --- a/manifests/ui.pp +++ b/manifests/ui.pp @@ -65,10 +65,18 @@ # The ironic proxy endpoint url # Defaults to undef # +# [*endpoint_proxy_ironic_inspector*] +# The ironic inspector proxy endpoint url +# Defaults to undef +# # [*endpoint_config_ironic*] # The ironic config endpoint url # Defaults to undef # +# [*endpoint_config_ironic_inspector*] +# The ironic inspector config endpoint url +# Defaults to undef +# # [*endpoint_proxy_mistral*] # The mistral proxy endpoint url # Defaults to undef @@ -112,18 +120,20 @@ class tripleo::ui ( 'ko-KR' => 'Korean', 'zh-CN' => 'Simplified Chinese' }, - $endpoint_proxy_zaqar = undef, - $endpoint_proxy_keystone = undef, - $endpoint_proxy_heat = undef, - $endpoint_proxy_ironic = undef, - $endpoint_proxy_mistral = undef, - $endpoint_proxy_swift = undef, - $endpoint_config_zaqar = undef, - $endpoint_config_keystone = undef, - $endpoint_config_heat = undef, - $endpoint_config_ironic = undef, - $endpoint_config_mistral = undef, - $endpoint_config_swift = undef, + $endpoint_proxy_zaqar = undef, + $endpoint_proxy_keystone = undef, + $endpoint_proxy_heat = undef, + $endpoint_proxy_ironic = undef, + $endpoint_proxy_ironic_inspector = undef, + $endpoint_proxy_mistral = undef, + $endpoint_proxy_swift = undef, + $endpoint_config_zaqar = undef, + $endpoint_config_keystone = undef, + $endpoint_config_heat = undef, + $endpoint_config_ironic = undef, + $endpoint_config_ironic_inspector = undef, + $endpoint_config_mistral = undef, + $endpoint_config_swift = undef, ) { @@ -160,6 +170,11 @@ class tripleo::ui ( 'reverse_urls' => $endpoint_proxy_ironic }, { + 'path' => '/ironic-inspector', + 'url' => $endpoint_proxy_ironic_inspector, + 'reverse_urls' => $endpoint_proxy_ironic_inspector + }, + { 'path' => '/mistral', 'url' => $endpoint_proxy_mistral, 'reverse_urls' => $endpoint_proxy_mistral diff --git a/releasenotes/notes/add-support-for-proxying-ironic-inspector-via-apache-ea70e9fa1ad04553.yaml b/releasenotes/notes/add-support-for-proxying-ironic-inspector-via-apache-ea70e9fa1ad04553.yaml new file mode 100644 index 0000000..940c20e --- /dev/null +++ b/releasenotes/notes/add-support-for-proxying-ironic-inspector-via-apache-ea70e9fa1ad04553.yaml @@ -0,0 +1,6 @@ +--- +features: + - | + Added variables for endpoint_proxy_ironic_inspector, + endpoint_config_ironic_inspector, and Apache mod_proxy configuration to + proxy ironic-inspector service just like similar services diff --git a/templates/ui/tripleo_ui_config.js.erb b/templates/ui/tripleo_ui_config.js.erb index f179637..cd02798 100644 --- a/templates/ui/tripleo_ui_config.js.erb +++ b/templates/ui/tripleo_ui_config.js.erb @@ -7,6 +7,7 @@ window.tripleOUiConfig = { 'keystone': '<%= @endpoint_config_keystone %>', 'heat': '<%= @endpoint_config_heat %>', 'ironic': '<%= @endpoint_config_ironic %>', + 'ironic-inspector': '<%= @endpoint_config_ironic_inspector %>', 'mistral': '<%= @endpoint_config_mistral %>', 'swift': '<%= @endpoint_config_swift %>', 'zaqar-websocket': '<%= @endpoint_config_zaqar %>', |