Browse Source
Sahara support was deprecated during previous Ussuri cycle[1], so we
can remove it completely now.
[1] f1d9b15c85
Change-Id: Id047221cb912c09984cc3bf864196a26fd36736f
changes/19/734119/7
Takashi Kajinami
1 year ago
35 changed files with 5 additions and 947 deletions
@ -1,215 +0,0 @@ |
|||
heat_template_version: rocky |
|||
|
|||
description: > |
|||
OpenStack Sahara service configured with Puppet |
|||
|
|||
parameters: |
|||
ContainerSaharaApiImage: |
|||
description: image |
|||
type: string |
|||
ContainerSaharaConfigImage: |
|||
description: The container image to use for the sahara config_volume |
|||
type: string |
|||
SaharaApiLoggingSource: |
|||
type: json |
|||
default: |
|||
tag: openstack.sahara.api |
|||
file: /var/log/containers/sahara/sahara-api.log |
|||
EndpointMap: |
|||
default: {} |
|||
description: Mapping of service endpoint -> protocol. Typically set |
|||
via parameter_defaults in the resource registry. |
|||
type: json |
|||
ServiceData: |
|||
default: {} |
|||
description: Dictionary packing service data |
|||
type: json |
|||
ServiceNetMap: |
|||
default: {} |
|||
description: Mapping of service_name -> network name. Typically set |
|||
via parameter_defaults in the resource registry. This |
|||
mapping overrides those in ServiceNetMapDefaults. |
|||
type: json |
|||
DefaultPasswords: |
|||
default: {} |
|||
type: json |
|||
RoleName: |
|||
default: '' |
|||
description: Role name on which the service is applied |
|||
type: string |
|||
RoleParameters: |
|||
default: {} |
|||
description: Parameters specific to the role |
|||
type: json |
|||
DeployIdentifier: |
|||
default: '' |
|||
type: string |
|||
description: > |
|||
Setting this to a unique value will re-run any deployment tasks which |
|||
perform configuration on a Heat stack-update. |
|||
SaharaPassword: |
|||
description: The password for the sahara service account, used by sahara-api. |
|||
type: string |
|||
hidden: true |
|||
SaharaWorkers: |
|||
default: 0 |
|||
description: The number of workers for the sahara-api. |
|||
type: number |
|||
KeystoneRegion: |
|||
type: string |
|||
default: 'regionOne' |
|||
description: Keystone region for endpoint |
|||
MonitoringSubscriptionSaharaApi: |
|||
default: 'overcloud-sahara-api' |
|||
type: string |
|||
SaharaApiPolicies: |
|||
description: | |
|||
A hash of policies to configure for Sahara API. |
|||
e.g. { sahara-context_is_admin: { key: context_is_admin, value: 'role:admin' } } |
|||
default: {} |
|||
type: json |
|||
|
|||
resources: |
|||
|
|||
ContainersCommon: |
|||
type: ../../containers-common.yaml |
|||
|
|||
MySQLClient: |
|||
type: ../../database/mysql-client.yaml |
|||
|
|||
SaharaPuppetBase: |
|||
type: ./sahara-base.yaml |
|||
properties: |
|||
ServiceData: {get_param: ServiceData} |
|||
ServiceNetMap: {get_param: ServiceNetMap} |
|||
DefaultPasswords: {get_param: DefaultPasswords} |
|||
EndpointMap: {get_param: EndpointMap} |
|||
RoleName: {get_param: RoleName} |
|||
RoleParameters: {get_param: RoleParameters} |
|||
|
|||
outputs: |
|||
role_data: |
|||
description: Role data for the Sahara API role. |
|||
value: |
|||
service_name: sahara_api |
|||
firewall_rules: |
|||
'132 sahara': |
|||
dport: |
|||
- 8386 |
|||
- 13386 |
|||
keystone_resources: |
|||
sahara: |
|||
endpoints: |
|||
public: {get_param: [EndpointMap, SaharaPublic, uri]} |
|||
internal: {get_param: [EndpointMap, SaharaInternal, uri]} |
|||
admin: {get_param: [EndpointMap, SaharaAdmin, uri]} |
|||
users: |
|||
sahara: |
|||
password: {get_param: SaharaPassword} |
|||
region: {get_param: KeystoneRegion} |
|||
service: 'data-processing' |
|||
monitoring_subscription: {get_param: MonitoringSubscriptionSaharaApi} |
|||
config_settings: |
|||
map_merge: |
|||
- sahara::sync_db: false |
|||
- get_attr: [SaharaPuppetBase, role_data, config_settings] |
|||
- sahara::port: {get_param: [EndpointMap, SaharaInternal, port]} |
|||
sahara::policy::policies: {get_param: SaharaApiPolicies} |
|||
sahara::service::api::api_workers: {get_param: SaharaWorkers} |
|||
# NOTE: bind IP is found in hiera replacing the network name with the local node IP |
|||
# for the given network; replacement examples (eg. for internal_api): |
|||
# internal_api -> IP |
|||
# internal_api_uri -> [IP] |
|||
# internal_api_subnet - > IP/CIDR |
|||
sahara::host: |
|||
str_replace: |
|||
template: |
|||
"%{hiera('$NETWORK')}" |
|||
params: |
|||
$NETWORK: {get_param: [ServiceNetMap, SaharaApiNetwork]} |
|||
service_config_settings: |
|||
rsyslog: |
|||
tripleo_logging_sources_sahara_api: |
|||
- {get_param: SaharaApiLoggingSource} |
|||
mysql: |
|||
sahara::db::mysql::password: {get_param: SaharaPassword} |
|||
sahara::db::mysql::user: sahara |
|||
sahara::db::mysql::host: {get_param: [EndpointMap, MysqlInternal, host_nobrackets]} |
|||
sahara::db::mysql::dbname: sahara |
|||
sahara::db::mysql::allowed_hosts: |
|||
- '%' |
|||
- "%{hiera('mysql_bind_host')}" |
|||
# BEGIN DOCKER SETTINGS # |
|||
puppet_config: |
|||
config_volume: sahara |
|||
puppet_tags: sahara_api_paste_ini,sahara_cluster_template,sahara_config,sahara_node_group_template |
|||
step_config: |
|||
list_join: |
|||
- "\n" |
|||
- - include tripleo::profile::base::sahara::api |
|||
- {get_attr: [MySQLClient, role_data, step_config]} |
|||
config_image: {get_param: ContainerSaharaConfigImage} |
|||
kolla_config: |
|||
/var/lib/kolla/config_files/sahara-api.json: |
|||
command: /usr/bin/sahara-api --config-file /etc/sahara/sahara.conf |
|||
config_files: |
|||
- source: "/var/lib/kolla/config_files/src/*" |
|||
dest: "/" |
|||
merge: true |
|||
preserve_properties: true |
|||
permissions: |
|||
- path: /var/lib/sahara |
|||
owner: sahara:sahara |
|||
recurse: true |
|||
- path: /var/log/sahara |
|||
owner: sahara:sahara |
|||
recurse: true |
|||
docker_config: |
|||
step_3: |
|||
sahara_db_sync: |
|||
image: &sahara_api_image {get_param: ContainerSaharaApiImage} |
|||
net: host |
|||
privileged: false |
|||
detach: false |
|||
user: root |
|||
volumes: |
|||
list_concat: |
|||
- {get_attr: [ContainersCommon, volumes]} |
|||
- |
|||
- /var/lib/config-data/sahara/etc/my.cnf.d/tripleo.cnf:/etc/my.cnf.d/tripleo.cnf:ro |
|||
- /var/lib/config-data/sahara/etc/sahara/:/etc/sahara/:ro |
|||
- /lib/modules:/lib/modules:ro |
|||
- /var/lib/sahara:/var/lib/sahara |
|||
- /var/log/containers/sahara:/var/log/sahara |
|||
command: "/usr/bin/bootstrap_host_exec sahara_api su sahara -s /bin/bash -c 'sahara-db-manage --config-file /etc/sahara/sahara.conf upgrade head'" |
|||
environment: |
|||
TRIPLEO_DEPLOY_IDENTIFIER: {get_param: DeployIdentifier} |
|||
step_4: |
|||
sahara_api: |
|||
image: *sahara_api_image |
|||
net: host |
|||
privileged: false |
|||
restart: always |
|||
healthcheck: |
|||
test: /openstack/healthcheck |
|||
volumes: |
|||
list_concat: |
|||
- {get_attr: [ContainersCommon, volumes]} |
|||
- |
|||
- /var/lib/kolla/config_files/sahara-api.json:/var/lib/kolla/config_files/config.json |
|||
- /var/lib/config-data/puppet-generated/sahara:/var/lib/kolla/config_files/src:ro |
|||
- /lib/modules:/lib/modules:ro |
|||
- /var/lib/sahara:/var/lib/sahara |
|||
- /var/log/containers/sahara:/var/log/sahara |
|||
environment: |
|||
KOLLA_CONFIG_STRATEGY: COPY_ALWAYS |
|||
host_prep_tasks: |
|||
- name: create persistent directories |
|||
file: |
|||
path: "{{ item.path }}" |
|||
state: directory |
|||
setype: "{{ item.setype }}" |
|||
mode: "{{ item.mode|default(omit) }}" |
|||
with_items: |
|||
- { 'path': /var/log/containers/sahara, 'setype': container_file_t, 'mode': '0750' } |
|||
- { 'path': /var/lib/sahara, 'setype': container_file_t } |
|||
@ -1,120 +0,0 @@ |
|||
heat_template_version: rocky |
|||
|
|||
description: > |
|||
OpenStack Sahara base service. Shared for all Sahara services. |
|||
|
|||
parameters: |
|||
ServiceData: |
|||
default: {} |
|||
description: Dictionary packing service data |
|||
type: json |
|||
ServiceNetMap: |
|||
default: {} |
|||
description: Mapping of service_name -> network name. Typically set |
|||
via parameter_defaults in the resource registry. This |
|||
mapping overrides those in ServiceNetMapDefaults. |
|||
type: json |
|||
DefaultPasswords: |
|||
default: {} |
|||
type: json |
|||
RoleName: |
|||
default: '' |
|||
description: Role name on which the service is applied |
|||
type: string |
|||
RoleParameters: |
|||
default: {} |
|||
description: Parameters specific to the role |
|||
type: json |
|||
EndpointMap: |
|||
default: {} |
|||
description: Mapping of service endpoint -> protocol. Typically set |
|||
via parameter_defaults in the resource registry. |
|||
type: json |
|||
SaharaPassword: |
|||
description: The password for the sahara service account, used by sahara-api. |
|||
type: string |
|||
hidden: true |
|||
Debug: |
|||
type: boolean |
|||
default: false |
|||
description: Set to True to enable debugging on all services. |
|||
SaharaDebug: |
|||
default: '' |
|||
description: Set to True to enable debugging Sahara services. |
|||
type: string |
|||
constraints: |
|||
- allowed_values: [ '', 'true', 'True', 'TRUE', 'false', 'False', 'FALSE'] |
|||
EnableSQLAlchemyCollectd: |
|||
type: boolean |
|||
description: > |
|||
Set to true to enable the SQLAlchemy-collectd server plugin |
|||
default: false |
|||
SaharaPlugins: |
|||
default: ["ambari","cdh","mapr","vanilla","spark","storm"] |
|||
description: Sahara enabled plugin list |
|||
type: comma_delimited_list |
|||
NotificationDriver: |
|||
type: string |
|||
default: 'noop' |
|||
description: Driver or drivers to handle sending notifications. |
|||
NtpServer: |
|||
default: ['0.pool.ntp.org', '1.pool.ntp.org', '2.pool.ntp.org', '3.pool.ntp.org'] |
|||
description: NTP servers list. Defaulted to a set of pool.ntp.org servers |
|||
in order to have a sane default for Pacemaker deployments when |
|||
not configuring this parameter by default. |
|||
type: comma_delimited_list |
|||
KeystoneRegion: |
|||
type: string |
|||
default: 'regionOne' |
|||
description: Keystone region for endpoint |
|||
|
|||
conditions: |
|||
service_debug_unset: {equals : [{get_param: SaharaDebug}, '']} |
|||
enable_sqlalchemy_collectd: {equals : [{get_param: EnableSQLAlchemyCollectd}, true]} |
|||
|
|||
outputs: |
|||
role_data: |
|||
description: Role data for the Sahara base service. |
|||
value: |
|||
service_name: sahara_base |
|||
config_settings: |
|||
sahara::database_connection: |
|||
make_url: |
|||
scheme: {get_param: [EndpointMap, MysqlInternal, protocol]} |
|||
username: sahara |
|||
password: {get_param: SaharaPassword} |
|||
host: {get_param: [EndpointMap, MysqlInternal, host]} |
|||
path: /sahara |
|||
query: |
|||
if: |
|||
- enable_sqlalchemy_collectd |
|||
- |
|||
read_default_file: /etc/my.cnf.d/tripleo.cnf |
|||
read_default_group: tripleo |
|||
plugin: collectd |
|||
collectd_program_name: sahara |
|||
collectd_host: localhost |
|||
- |
|||
read_default_file: /etc/my.cnf.d/tripleo.cnf |
|||
read_default_group: tripleo |
|||
|
|||
sahara::notify::notification_driver: {get_param: NotificationDriver} |
|||
sahara::logging::debug: |
|||
if: |
|||
- service_debug_unset |
|||
- {get_param: Debug } |
|||
- {get_param: SaharaDebug } |
|||
sahara::default_ntp_server: {get_param: NtpServer} |
|||
sahara::use_neutron: true |
|||
sahara::plugins: {get_param: SaharaPlugins} |
|||
sahara::rpc_backend: rabbit |
|||
sahara::db::database_db_max_retries: -1 |
|||
sahara::db::database_max_retries: -1 |
|||
sahara::keystone::authtoken::www_authenticate_uri: {get_param: [EndpointMap, KeystoneInternal, uri_no_suffix]} |
|||
sahara::keystone::authtoken::auth_url: {get_param: [EndpointMap, KeystoneInternal, uri_no_suffix]} |
|||
sahara::keystone::authtoken::password: {get_param: SaharaPassword} |
|||
sahara::keystone::authtoken::project_name: 'service' |
|||
sahara::keystone::authtoken::user_domain_name: 'Default' |
|||
sahara::keystone::authtoken::project_domain_name: 'Default' |
|||
sahara::keystone::authtoken::region_name: {get_param: KeystoneRegion} |
|||
sahara::keystone::authtoken::interface: 'internal' |
|||
@ -1,137 +0,0 @@ |
|||
heat_template_version: rocky |
|||
|
|||
description: > |
|||
OpenStack Sahara service |
|||
|
|||
parameters: |
|||
ContainerSaharaEngineImage: |
|||
description: image |
|||
type: string |
|||
ContainerSaharaConfigImage: |
|||
description: The container image to use for the sahara config_volume |
|||
type: string |
|||
SaharaEngineLoggingSource: |
|||
type: json |
|||
default: |
|||
tag: openstack.sahara.engine |
|||
file: /var/log/containers/sahara/sahara-engine.log |
|||
EndpointMap: |
|||
default: {} |
|||
description: Mapping of service endpoint -> protocol. Typically set |
|||
via parameter_defaults in the resource registry. |
|||
type: json |
|||
ServiceData: |
|||
default: {} |
|||
description: Dictionary packing service data |
|||
type: json |
|||
ServiceNetMap: |
|||
default: {} |
|||
description: Mapping of service_name -> network name. Typically set |
|||
via parameter_defaults in the resource registry. This |
|||
mapping overrides those in ServiceNetMapDefaults. |
|||
type: json |
|||
DefaultPasswords: |
|||
default: {} |
|||
type: json |
|||
RoleName: |
|||
default: '' |
|||
description: Role name on which the service is applied |
|||
type: string |
|||
RoleParameters: |
|||
default: {} |
|||
description: Parameters specific to the role |
|||
type: json |
|||
MonitoringSubscriptionSaharaEngine: |
|||
default: 'overcloud-sahara-engine' |
|||
type: string |
|||
|
|||
resources: |
|||
|
|||
ContainersCommon: |
|||
type: ../../containers-common.yaml |
|||
|
|||
MySQLClient: |
|||
type: ../../database/mysql-client.yaml |
|||
|
|||
SaharaBase: |
|||
type: ./sahara-base.yaml |
|||
properties: |
|||
ServiceData: {get_param: ServiceData} |
|||
ServiceNetMap: {get_param: ServiceNetMap} |
|||
DefaultPasswords: {get_param: DefaultPasswords} |
|||
EndpointMap: {get_param: EndpointMap} |
|||
RoleName: {get_param: RoleName} |
|||
RoleParameters: {get_param: RoleParameters} |
|||
|
|||
outputs: |
|||
role_data: |
|||
description: Role data for the Sahara Engine role. |
|||
value: |
|||
service_name: sahara_engine |
|||
monitoring_subscription: {get_param: MonitoringSubscriptionSaharaEngine} |
|||
config_settings: |
|||
map_merge: |
|||
- get_attr: [SaharaBase, role_data, config_settings] |
|||
- sahara::sync_db: false |
|||
service_config_settings: |
|||
rsyslog: |
|||
tripleo_logging_sources_sahara_engine: |
|||
- {get_param: SaharaEngineLoggingSource} |
|||
# BEGIN DOCKER SETTINGS # |
|||
puppet_config: |
|||
config_volume: sahara |
|||
puppet_tags: sahara_engine_paste_ini,sahara_cluster_template,sahara_config,sahara_node_group_template |
|||
step_config: |
|||
list_join: |
|||
- "\n" |
|||
- - include tripleo::profile::base::sahara::engine |
|||
- {get_attr: [MySQLClient, role_data, step_config]} |
|||
config_image: {get_param: ContainerSaharaConfigImage} |
|||
kolla_config: |
|||
/var/lib/kolla/config_files/sahara-engine.json: |
|||
command: /usr/bin/sahara-engine --config-file /etc/sahara/sahara.conf |
|||
config_files: |
|||
- source: "/var/lib/kolla/config_files/src/*" |
|||
dest: "/" |
|||
merge: true |
|||
preserve_properties: true |
|||
permissions: |
|||
- path: /var/lib/sahara |
|||
owner: sahara:sahara |
|||
recurse: true |
|||
- path: /var/log/sahara |
|||
owner: sahara:sahara |
|||
recurse: true |
|||
docker_config: |
|||
step_4: |
|||
sahara_engine: |
|||
image: {get_param: ContainerSaharaEngineImage} |
|||
net: host |
|||
privileged: false |
|||
restart: always |
|||
healthcheck: {get_attr: [ContainersCommon, healthcheck_rpc_port]} |
|||
volumes: |
|||
list_concat: |
|||
- {get_attr: [ContainersCommon, volumes]} |
|||
- |
|||
- /var/lib/kolla/config_files/sahara-engine.json:/var/lib/kolla/config_files/config.json |
|||
- /var/lib/config-data/puppet-generated/sahara:/var/lib/kolla/config_files/src:ro |
|||
- /var/lib/sahara:/var/lib/sahara |
|||
- /var/log/containers/sahara:/var/log/sahara |
|||
environment: |
|||
KOLLA_CONFIG_STRATEGY: COPY_ALWAYS |
|||
host_prep_tasks: |
|||
- name: create persistent directories |
|||
file: |
|||
path: "{{ item.path }}" |
|||
state: directory |
|||
setype: "{{ item.setype }}" |
|||
mode: "{{ item.mode|default(omit) }}" |
|||
with_items: |
|||
- { 'path': /var/log/containers/sahara, 'setype': container_file_t, 'mode': '0750' } |
|||
- { 'path': /var/lib/sahara, 'setype': container_file_t } |
|||
- name: enable virt_sandbox_use_netlink for healthcheck |
|||
seboolean: |
|||
name: virt_sandbox_use_netlink |
|||
persistent: yes |
|||
state: yes |
|||
@ -1,3 +0,0 @@ |
|||
resource_registry: |
|||
OS::TripleO::Services::SaharaApi: ../../deployment/deprecated/sahara/sahara-api-container-puppet.yaml |
|||
OS::TripleO::Services::SaharaEngine: ../../deployment/deprecated/sahara/sahara-engine-container-puppet.yaml |
|||
@ -0,0 +1,4 @@ |
|||
--- |
|||
upgrade: |
|||
- | |
|||
Support for Sahara service has been removed. |
|||
Loading…
Reference in new issue