Remove deployment of panko
Panko project has been retired in Xena cycle [1]. This patch is removing the code to deploy panko with packstack. [1] https://review.opendev.org/c/openstack/panko/+/791683 Change-Id: Iae2d7bc40732027990666819eca6d386ffa1804b
This commit is contained in:
parent
0f9f5b3adc
commit
4f28c22b97
@ -25,7 +25,6 @@
|
||||
- openstack/puppet-openstacklib
|
||||
- openstack/puppet-oslo
|
||||
- openstack/puppet-ovn
|
||||
- openstack/puppet-panko
|
||||
- openstack/puppet-placement
|
||||
- openstack/puppet-sahara
|
||||
- openstack/puppet-swift
|
||||
|
@ -70,10 +70,6 @@ mod 'ovn',
|
||||
:git => 'https://github.com/openstack/puppet-ovn',
|
||||
:ref => 'master'
|
||||
|
||||
mod 'panko',
|
||||
:git => 'https://github.com/openstack/puppet-panko',
|
||||
:ref => 'master'
|
||||
|
||||
mod 'placement',
|
||||
:git => 'https://github.com/openstack/puppet-placement',
|
||||
:ref => 'master'
|
||||
|
@ -248,7 +248,6 @@ cinder X X
|
||||
ceilometer X X
|
||||
aodh X X
|
||||
gnocchi X X
|
||||
panko X
|
||||
heat X
|
||||
swift X X
|
||||
sahara X
|
||||
|
@ -66,9 +66,6 @@ Global Options
|
||||
**CONFIG_AODH_INSTALL**
|
||||
Specify 'y' to install OpenStack Telemetry Alarming (Aodh). Note Aodh requires Ceilometer to be installed as well. ['y', 'n']
|
||||
|
||||
**CONFIG_PANKO_INSTALL**
|
||||
Specify 'y' to install OpenStack Events Service (panko). ['y', 'n']
|
||||
|
||||
**CONFIG_HEAT_INSTALL**
|
||||
Specify 'y' to install OpenStack Orchestration (heat). ['y', 'n']
|
||||
|
||||
@ -1073,15 +1070,6 @@ Gnocchi Config parameters
|
||||
**CONFIG_GNOCCHI_KS_PW**
|
||||
Password to use for Gnocchi to authenticate with the Identity service.
|
||||
|
||||
Panko Config parameters
|
||||
-------------------------
|
||||
|
||||
**CONFIG_PANKO_DB_PW**
|
||||
Password to use for Panko to access the database.
|
||||
|
||||
**CONFIG_PANKO_KS_PW**
|
||||
Password to use for Panko to authenticate with the Identity service.
|
||||
|
||||
|
||||
Sahara Config parameters
|
||||
------------------------
|
||||
|
@ -1,103 +0,0 @@
|
||||
# -*- coding: utf-8 -*-
|
||||
# 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.
|
||||
|
||||
"""
|
||||
Installs and configures Panko
|
||||
"""
|
||||
|
||||
from packstack.installer import basedefs
|
||||
from packstack.installer import utils
|
||||
from packstack.installer import validators
|
||||
from packstack.installer import processors
|
||||
|
||||
from packstack.modules.documentation import update_params_usage
|
||||
|
||||
# ------------- Panko Packstack Plugin Initialization --------------
|
||||
|
||||
PLUGIN_NAME = "OS-Panko"
|
||||
PLUGIN_NAME_COLORED = utils.color_text(PLUGIN_NAME, 'blue')
|
||||
|
||||
|
||||
def initConfig(controller):
|
||||
panko_params = {
|
||||
"PANKO": [
|
||||
{"CONF_NAME": "CONFIG_PANKO_DB_PW",
|
||||
"CMD_OPTION": "panko-db-passwd",
|
||||
"PROMPT": "Enter the password for Panko DB access",
|
||||
"OPTION_LIST": [],
|
||||
"VALIDATORS": [validators.validate_not_empty],
|
||||
"DEFAULT_VALUE": "PW_PLACEHOLDER",
|
||||
"PROCESSORS": [processors.process_password],
|
||||
"MASK_INPUT": True,
|
||||
"LOOSE_VALIDATION": False,
|
||||
"USE_DEFAULT": False,
|
||||
"NEED_CONFIRM": True,
|
||||
"CONDITION": False},
|
||||
{"CONF_NAME": "CONFIG_PANKO_KS_PW",
|
||||
"CMD_OPTION": "panko-ks-passwd",
|
||||
"PROMPT": "Enter the password for the Panko Keystone access",
|
||||
"OPTION_LIST": [],
|
||||
"VALIDATORS": [validators.validate_not_empty],
|
||||
"DEFAULT_VALUE": "PW_PLACEHOLDER",
|
||||
"PROCESSORS": [processors.process_password],
|
||||
"MASK_INPUT": True,
|
||||
"LOOSE_VALIDATION": False,
|
||||
"USE_DEFAULT": False,
|
||||
"NEED_CONFIRM": True,
|
||||
"CONDITION": False}
|
||||
]
|
||||
}
|
||||
|
||||
update_params_usage(basedefs.PACKSTACK_DOC, panko_params)
|
||||
|
||||
def use_panko(config):
|
||||
return (config['CONFIG_CEILOMETER_INSTALL'] == 'y' and
|
||||
config['CONFIG_PANKO_INSTALL'] == 'y')
|
||||
|
||||
panko_groups = [
|
||||
{"GROUP_NAME": "PANKO",
|
||||
"DESCRIPTION": "Panko Config parameters",
|
||||
"PRE_CONDITION": use_panko,
|
||||
"PRE_CONDITION_MATCH": True,
|
||||
"POST_CONDITION": False,
|
||||
"POST_CONDITION_MATCH": True},
|
||||
]
|
||||
for group in panko_groups:
|
||||
paramList = panko_params[group["GROUP_NAME"]]
|
||||
controller.addGroup(group, paramList)
|
||||
|
||||
|
||||
def initSequences(controller):
|
||||
if (controller.CONF['CONFIG_PANKO_INSTALL'] != 'y' or
|
||||
controller.CONF['CONFIG_CEILOMETER_INSTALL'] != 'y'):
|
||||
return
|
||||
|
||||
steps = [{'title': 'Preparing Panko entries',
|
||||
'functions': [create_manifest]}]
|
||||
controller.addSequence("Installing OpenStack Panko", [], [],
|
||||
steps)
|
||||
|
||||
|
||||
# -------------------------- step functions --------------------------
|
||||
|
||||
def create_manifest(config, messages):
|
||||
fw_details = dict()
|
||||
key = "panko_api"
|
||||
fw_details.setdefault(key, {})
|
||||
fw_details[key]['host'] = "ALL"
|
||||
fw_details[key]['service_name'] = "panko-api"
|
||||
fw_details[key]['chain'] = "INPUT"
|
||||
fw_details[key]['ports'] = ['8977']
|
||||
fw_details[key]['proto'] = "tcp"
|
||||
config['FIREWALL_PANKO_RULES'] = fw_details
|
@ -231,20 +231,6 @@ def initConfig(controller):
|
||||
"NEED_CONFIRM": False,
|
||||
"CONDITION": False},
|
||||
|
||||
{"CMD_OPTION": "os-panko-install",
|
||||
"PROMPT": (
|
||||
"Should Packstack install OpenStack Events Service (Panko)"
|
||||
),
|
||||
"OPTION_LIST": ["y", "n"],
|
||||
"VALIDATORS": [validators.validate_options],
|
||||
"DEFAULT_VALUE": "n",
|
||||
"MASK_INPUT": False,
|
||||
"LOOSE_VALIDATION": False,
|
||||
"CONF_NAME": "CONFIG_PANKO_INSTALL",
|
||||
"USE_DEFAULT": False,
|
||||
"NEED_CONFIRM": False,
|
||||
"CONDITION": False},
|
||||
|
||||
{"CMD_OPTION": "os-sahara-install",
|
||||
"PROMPT": (
|
||||
"Should Packstack install OpenStack Clustering (Sahara)."
|
||||
|
@ -150,7 +150,7 @@ def copy_puppet_modules(config, messages):
|
||||
'gnocchi', 'heat', 'horizon', 'inifile', 'ironic',
|
||||
'keystone', 'magnum', 'manila', 'memcached',
|
||||
'mysql', 'neutron', 'nova', 'nssdb', 'openstack',
|
||||
'openstacklib', 'oslo', 'ovn', 'packstack', 'panko',
|
||||
'openstacklib', 'oslo', 'ovn', 'packstack',
|
||||
'placement', 'rabbitmq', 'redis', 'remote', 'rsync',
|
||||
'sahara', 'ssh', 'stdlib', 'swift', 'sysctl',
|
||||
'systemd', 'tempest', 'trove', 'vcsrepo',
|
||||
|
@ -40,10 +40,5 @@ class packstack::apache ()
|
||||
# Gnocchi port
|
||||
apache::listen { '8041': }
|
||||
}
|
||||
|
||||
if hiera('CONFIG_PANKO_INSTALL') == 'y' {
|
||||
# Panko port
|
||||
apache::listen { '8977': }
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -40,7 +40,7 @@ class packstack::ceilometer ()
|
||||
|
||||
class { 'ceilometer::agent::notification':
|
||||
manage_event_pipeline => true,
|
||||
event_pipeline_publishers => ['gnocchi://', 'panko://'],
|
||||
event_pipeline_publishers => ['gnocchi://'],
|
||||
}
|
||||
|
||||
class { 'ceilometer::agent::service_credentials':
|
||||
|
@ -1,12 +0,0 @@
|
||||
class packstack::keystone::panko ()
|
||||
{
|
||||
$keystone_host_url = hiera('CONFIG_KEYSTONE_HOST_URL')
|
||||
|
||||
class { 'panko::keystone::auth':
|
||||
region => hiera('CONFIG_KEYSTONE_REGION'),
|
||||
password => hiera('CONFIG_PANKO_KS_PW'),
|
||||
public_url => "http://${keystone_host_url}:8977",
|
||||
admin_url => "http://${keystone_host_url}:8977",
|
||||
internal_url => "http://${keystone_host_url}:8977",
|
||||
}
|
||||
}
|
@ -108,15 +108,6 @@ class packstack::mariadb::services ()
|
||||
}
|
||||
}
|
||||
|
||||
if hiera('CONFIG_PANKO_INSTALL') == 'y' and
|
||||
hiera('CONFIG_CEILOMETER_INSTALL') == 'y' {
|
||||
class { 'panko::db::mysql':
|
||||
password => hiera('CONFIG_PANKO_DB_PW'),
|
||||
host => '%',
|
||||
allowed_hosts => '%',
|
||||
}
|
||||
}
|
||||
|
||||
if hiera('CONFIG_SAHARA_INSTALL') == 'y' {
|
||||
class { 'sahara::db::mysql':
|
||||
password => hiera('CONFIG_SAHARA_DB_PW'),
|
||||
|
@ -152,37 +152,6 @@ class packstack::mariadb::services_remote () {
|
||||
}
|
||||
}
|
||||
|
||||
if hiera('CONFIG_PANKO_INSTALL') == 'y' {
|
||||
remote_database { 'panko':
|
||||
ensure => 'present',
|
||||
charset => 'utf8',
|
||||
db_host => hiera('CONFIG_MARIADB_HOST'),
|
||||
db_user => hiera('CONFIG_MARIADB_USER'),
|
||||
db_password => hiera('CONFIG_MARIADB_PW'),
|
||||
provider => 'mysql',
|
||||
}
|
||||
|
||||
$panko_cfg_db_pw = hiera('CONFIG_PANKO_DB_PW')
|
||||
|
||||
remote_database_user { 'panko@%':
|
||||
password_hash => mysql_password($panko_cfg_db_pw),
|
||||
db_host => hiera('CONFIG_MARIADB_HOST'),
|
||||
db_user => hiera('CONFIG_MARIADB_USER'),
|
||||
db_password => hiera('CONFIG_MARIADB_PW'),
|
||||
provider => 'mysql',
|
||||
require => Remote_database['panko'],
|
||||
}
|
||||
|
||||
remote_database_grant { 'panko@%/panko':
|
||||
privileges => 'all',
|
||||
db_host => hiera('CONFIG_MARIADB_HOST'),
|
||||
db_user => hiera('CONFIG_MARIADB_USER'),
|
||||
db_password => hiera('CONFIG_MARIADB_PW'),
|
||||
provider => 'mysql',
|
||||
require => Remote_database_user['panko@%'],
|
||||
}
|
||||
}
|
||||
|
||||
if hiera('CONFIG_HEAT_INSTALL') == 'y' {
|
||||
remote_database { 'heat':
|
||||
ensure => 'present',
|
||||
|
@ -1,39 +0,0 @@
|
||||
class packstack::panko ()
|
||||
{
|
||||
create_resources(packstack::firewall, hiera('FIREWALL_PANKO_RULES', {}))
|
||||
|
||||
$panko_cfg_db_pw = hiera('CONFIG_PANKO_DB_PW')
|
||||
$panko_cfg_mariadb_host = hiera('CONFIG_MARIADB_HOST_URL')
|
||||
|
||||
class { 'panko::wsgi::apache':
|
||||
workers => hiera('CONFIG_SERVICE_WORKERS'),
|
||||
threads => hiera('CONFIG_SERVICE_WORKERS'),
|
||||
ssl => false
|
||||
}
|
||||
|
||||
include panko
|
||||
|
||||
class { 'panko::db':
|
||||
database_connection => "mysql+pymysql://panko:${panko_cfg_db_pw}@${panko_cfg_mariadb_host}/panko?charset=utf8",
|
||||
}
|
||||
|
||||
$bind_host = hiera('CONFIG_IP_VERSION') ? {
|
||||
'ipv6' => '::0',
|
||||
default => '0.0.0.0',
|
||||
}
|
||||
|
||||
class { 'panko::keystone::authtoken':
|
||||
www_authenticate_uri => hiera('CONFIG_KEYSTONE_PUBLIC_URL'),
|
||||
auth_url => hiera('CONFIG_KEYSTONE_ADMIN_URL'),
|
||||
auth_version => hiera('CONFIG_KEYSTONE_API_VERSION'),
|
||||
password => hiera('CONFIG_PANKO_KS_PW')
|
||||
}
|
||||
|
||||
class { 'panko::api':
|
||||
host => $bind_host,
|
||||
service_name => 'httpd'
|
||||
}
|
||||
|
||||
include panko::db::sync
|
||||
|
||||
}
|
@ -163,11 +163,6 @@ if hiera('CONFIG_PROVISION_TEMPEST') == 'y' {
|
||||
}
|
||||
|
||||
|
||||
if hiera('CONFIG_CEILOMETER_INSTALL') == 'y' and hiera('CONFIG_PANKO_INSTALL') == 'y' {
|
||||
include 'packstack::keystone::panko'
|
||||
include 'packstack::panko'
|
||||
}
|
||||
|
||||
if hiera('CONFIG_CEILOMETER_INSTALL') == 'y' {
|
||||
# setup gnocchi
|
||||
include 'packstack::keystone::gnocchi'
|
||||
|
@ -0,0 +1,10 @@
|
||||
---
|
||||
other:
|
||||
- |
|
||||
Service panko has been removed in OpenStack project
|
||||
in Xena. Packstack has removed support to deploying
|
||||
this service, what implies some changes:
|
||||
|
||||
* CONFIG_PANKO_INSTALL option has been removed.
|
||||
* CONFIG_PANKO_DB_PW option has been removed.
|
||||
* CONFIG_PANKO_KS_PW option has been removed.
|
@ -14,7 +14,6 @@ echo -e "Generating packstack config for:
|
||||
- ceilometer
|
||||
- aodh
|
||||
- gnocchi
|
||||
- panko
|
||||
- heat
|
||||
- magnum
|
||||
- tempest (regex: 'smoke TelemetryAlarming')"
|
||||
@ -38,7 +37,6 @@ $SUDO packstack ${ADDITIONAL_ARGS} \
|
||||
--glance-backend=file \
|
||||
--os-heat-install=y \
|
||||
--os-magnum-install=y \
|
||||
--os-panko-install=y \
|
||||
--nova-libvirt-virt-type=qemu \
|
||||
--provision-image-url="/tmp/cirros/cirros-$CIRROS_VERSION-$CIRROS_ARCH-disk.img" \
|
||||
--provision-demo=y \
|
||||
|
@ -96,8 +96,6 @@ function get_config_and_logs {
|
||||
'/var/log/ceilometer'
|
||||
'/etc/gnocchi' # gnocchi is nested under telemetry in governance
|
||||
'/var/log/gnocchi'
|
||||
'/var/log/panko'
|
||||
'/etc/panko' # panko is nested under telemetry in governance
|
||||
'/etc/rabbitmq/'
|
||||
'/var/log/rabbitmq'
|
||||
'/etc/my.cnf.d'
|
||||
|
Loading…
Reference in New Issue
Block a user