Browse Source

Remove Sahara support

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
parent
commit
4a7d56947a
35 changed files with 5 additions and 947 deletions
  1. +0
    -2
      README.rst
  2. +0
    -2
      ci/environments/scenario000-standalone.yaml
  3. +0
    -215
      deployment/deprecated/sahara/sahara-api-container-puppet.yaml
  4. +0
    -120
      deployment/deprecated/sahara/sahara-base.yaml
  5. +0
    -137
      deployment/deprecated/sahara/sahara-engine-container-puppet.yaml
  6. +0
    -1
      deployment/haproxy/haproxy-edge-container-puppet.yaml
  7. +1
    -1
      deployment/horizon/horizon-container-puppet.yaml
  8. +0
    -1
      environments/low-memory-usage.yaml
  9. +0
    -3
      environments/services/sahara.yaml
  10. +0
    -3
      environments/ssl/no-tls-endpoints-public-ip.yaml
  11. +0
    -3
      environments/ssl/tls-endpoints-public-dns.yaml
  12. +0
    -3
      environments/ssl/tls-endpoints-public-ip.yaml
  13. +0
    -3
      environments/ssl/tls-everywhere-endpoints-dns.yaml
  14. +0
    -2
      environments/standalone/standalone-overcloud.yaml
  15. +0
    -2
      environments/standalone/standalone-tripleo.yaml
  16. +0
    -2
      environments/undercloud/undercloud-minion.yaml
  17. +0
    -9
      network/endpoints/endpoint_data.yaml
  18. +0
    -393
      network/endpoints/endpoint_map.yaml
  19. +0
    -1
      network/service_net_map.j2.yaml
  20. +0
    -2
      overcloud-resource-registry-puppet.j2.yaml
  21. +4
    -0
      releasenotes/notes/remove-sahara-ffec9acf94d72905.yaml
  22. +0
    -2
      roles/Controller.yaml
  23. +0
    -2
      roles/ControllerAllNovaStandalone.yaml
  24. +0
    -2
      roles/ControllerNoCeph.yaml
  25. +0
    -2
      roles/ControllerNovaStandalone.yaml
  26. +0
    -2
      roles/ControllerOpenstack.yaml
  27. +0
    -2
      roles/ControllerSriov.yaml
  28. +0
    -2
      roles/ControllerStorageDashboard.yaml
  29. +0
    -2
      roles/ControllerStorageNfs.yaml
  30. +0
    -2
      roles/Standalone.yaml
  31. +0
    -2
      roles_data.yaml
  32. +0
    -12
      sample-env-generator/ssl.yaml
  33. +0
    -6
      sample-env-generator/standalone.yaml
  34. +0
    -2
      sample-env-generator/undercloud-minion.yaml
  35. +0
    -2
      tools/yaml-validate.py

+ 0
- 2
README.rst View File

@ -110,8 +110,6 @@ and should be executed according to the following table:
+----------------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+
| timezone | X | X | X | X | X | X | X | X | X | X | X | X |
+----------------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+
| sahara | | | | X | | | | | | | | |
+----------------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+
| mistral | | | | X | | | | | | | | |
+----------------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+
| swift | | | X | | | | | | | | | |


+ 0
- 2
ci/environments/scenario000-standalone.yaml View File

@ -162,8 +162,6 @@ resource_registry:
OS::TripleO::Services::Redis: OS::Heat::None
OS::TripleO::Services::RsyslogSidecar: OS::Heat::None
OS::TripleO::Services::SELinux: OS::Heat::None
OS::TripleO::Services::SaharaApi: OS::Heat::None
OS::TripleO::Services::SaharaEngine: OS::Heat::None
OS::TripleO::Services::Securetty: OS::Heat::None
OS::TripleO::Services::Snmp: OS::Heat::None
OS::TripleO::Services::SwiftDispersion: OS::Heat::None


+ 0
- 215
deployment/deprecated/sahara/sahara-api-container-puppet.yaml View File

@ -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 }

+ 0
- 120
deployment/deprecated/sahara/sahara-base.yaml View File

@ -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'

+ 0
- 137
deployment/deprecated/sahara/sahara-engine-container-puppet.yaml View File

@ -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

+ 0
- 1
deployment/haproxy/haproxy-edge-container-puppet.yaml View File

@ -127,7 +127,6 @@ outputs:
tripleo::haproxy::placement: false
tripleo::haproxy::rabbitmq: false
tripleo::haproxy::redis: false
tripleo::haproxy::sahara: false
tripleo::haproxy::swift_proxy_server: false
tripleo::haproxy::zaqar_api: false
tripleo::haproxy::zaqar_ws: false


+ 1
- 1
deployment/horizon/horizon-container-puppet.yaml View File

@ -361,7 +361,7 @@ outputs:
ENABLE_MURANO: 'no'
ENABLE_MISTRAL: 'no'
ENABLE_OCTAVIA: 'yes'
ENABLE_SAHARA: 'yes'
ENABLE_SAHARA: 'no'
ENABLE_TROVE: 'no'
# Not installed:
ENABLE_FREEZER: 'no'


+ 0
- 1
environments/low-memory-usage.yaml View File

@ -8,7 +8,6 @@ parameter_defaults:
NeutronMetadataWorkers: 1
NovaWorkers: 1
NovaSchedulerWorkers: 1
SaharaWorkers: 1
SwiftWorkers: 1
PlacementWorkers: 1
GnocchiMetricdWorkers: 1


+ 0
- 3
environments/services/sahara.yaml View File

@ -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
- 3
environments/ssl/no-tls-endpoints-public-ip.yaml View File

@ -84,9 +84,6 @@ parameter_defaults:
OctaviaAdmin: {protocol: http, port: '9876', host: IP_ADDRESS}
OctaviaInternal: {protocol: http, port: '9876', host: IP_ADDRESS}
OctaviaPublic: {protocol: http, port: '9876', host: IP_ADDRESS}
SaharaAdmin: {protocol: http, port: '8386', host: IP_ADDRESS}
SaharaInternal: {protocol: http, port: '8386', host: IP_ADDRESS}
SaharaPublic: {protocol: http, port: '8386', host: IP_ADDRESS}
SwiftAdmin: {protocol: http, port: '8080', host: IP_ADDRESS}
SwiftInternal: {protocol: http, port: '8080', host: IP_ADDRESS}
SwiftPublic: {protocol: http, port: '8080', host: IP_ADDRESS}


+ 0
- 3
environments/ssl/tls-endpoints-public-dns.yaml View File

@ -80,9 +80,6 @@ parameter_defaults:
OctaviaAdmin: {protocol: 'http', port: '9876', host: 'IP_ADDRESS'}
OctaviaInternal: {protocol: 'http', port: '9876', host: 'IP_ADDRESS'}
OctaviaPublic: {protocol: 'https', port: '13876', host: 'CLOUDNAME'}
SaharaAdmin: {protocol: 'http', port: '8386', host: 'IP_ADDRESS'}
SaharaInternal: {protocol: 'http', port: '8386', host: 'IP_ADDRESS'}
SaharaPublic: {protocol: 'https', port: '13386', host: 'CLOUDNAME'}
SwiftAdmin: {protocol: 'http', port: '8080', host: 'IP_ADDRESS'}
SwiftInternal: {protocol: 'http', port: '8080', host: 'IP_ADDRESS'}
SwiftPublic: {protocol: 'https', port: '13808', host: 'CLOUDNAME'}


+ 0
- 3
environments/ssl/tls-endpoints-public-ip.yaml View File

@ -80,9 +80,6 @@ parameter_defaults:
OctaviaAdmin: {protocol: 'http', port: '9876', host: 'IP_ADDRESS'}
OctaviaInternal: {protocol: 'http', port: '9876', host: 'IP_ADDRESS'}
OctaviaPublic: {protocol: 'https', port: '13876', host: 'IP_ADDRESS'}
SaharaAdmin: {protocol: 'http', port: '8386', host: 'IP_ADDRESS'}
SaharaInternal: {protocol: 'http', port: '8386', host: 'IP_ADDRESS'}
SaharaPublic: {protocol: 'https', port: '13386', host: 'IP_ADDRESS'}
SwiftAdmin: {protocol: 'http', port: '8080', host: 'IP_ADDRESS'}
SwiftInternal: {protocol: 'http', port: '8080', host: 'IP_ADDRESS'}
SwiftPublic: {protocol: 'https', port: '13808', host: 'IP_ADDRESS'}


+ 0
- 3
environments/ssl/tls-everywhere-endpoints-dns.yaml View File

@ -80,9 +80,6 @@ parameter_defaults:
OctaviaAdmin: {protocol: 'https', port: '9876', host: 'CLOUDNAME'}
OctaviaInternal: {protocol: 'https', port: '9876', host: 'CLOUDNAME'}
OctaviaPublic: {protocol: 'https', port: '13876', host: 'CLOUDNAME'}
SaharaAdmin: {protocol: 'https', port: '8386', host: 'CLOUDNAME'}
SaharaInternal: {protocol: 'https', port: '8386', host: 'CLOUDNAME'}
SaharaPublic: {protocol: 'https', port: '13386', host: 'CLOUDNAME'}
SwiftAdmin: {protocol: 'https', port: '8080', host: 'CLOUDNAME'}
SwiftInternal: {protocol: 'https', port: '8080', host: 'CLOUDNAME'}
SwiftPublic: {protocol: 'https', port: '13808', host: 'CLOUDNAME'}


+ 0
- 2
environments/standalone/standalone-overcloud.yaml View File

@ -102,6 +102,4 @@ resource_registry:
OS::TripleO::Services::MistralEventEngine: OS::Heat::None
OS::TripleO::Services::MistralExecutor: OS::Heat::None
OS::TripleO::Services::OpenStackClients: ../../deployment/clients/openstack-clients-baremetal-ansible.yaml
OS::TripleO::Services::SaharaApi: OS::Heat::None
OS::TripleO::Services::SaharaEngine: OS::Heat::None
OS::TripleO::Services::Zaqar: OS::Heat::None

+ 0
- 2
environments/standalone/standalone-tripleo.yaml View File

@ -123,7 +123,5 @@ resource_registry:
OS::TripleO::Services::Rear: OS::Heat::None
OS::TripleO::Services::Redis: OS::Heat::None
OS::TripleO::Services::Rsyslog: ../../deployment/logging/rsyslog-baremetal-ansible.yaml
OS::TripleO::Services::SaharaApi: OS::Heat::None
OS::TripleO::Services::SaharaEngine: OS::Heat::None
OS::TripleO::Services::Tmpwatch: ../../deployment/logrotate/tmpwatch-install.yaml
OS::TripleO::Services::Zaqar: OS::Heat::None

+ 0
- 2
environments/undercloud/undercloud-minion.yaml View File

@ -280,8 +280,6 @@ resource_registry:
OS::TripleO::Services::Redis: OS::Heat::None
OS::TripleO::Services::RsyslogSidecar: OS::Heat::None
OS::TripleO::Services::SELinux: OS::Heat::None
OS::TripleO::Services::SaharaApi: OS::Heat::None
OS::TripleO::Services::SaharaEngine: OS::Heat::None
OS::TripleO::Services::Securetty: OS::Heat::None
OS::TripleO::Services::Snmp: OS::Heat::None
OS::TripleO::Services::SwiftDispersion: OS::Heat::None


+ 0
- 9
network/endpoints/endpoint_data.yaml View File

@ -269,15 +269,6 @@ CephRgw:
'': /swift/v1/AUTH_%(project_id)s
port: 8080
Sahara:
Internal:
net_param: SaharaApi
Public:
net_param: Public
Admin:
net_param: SaharaApi
port: 8386
Ironic:
Internal:
net_param: IronicApi


+ 0
- 393
network/endpoints/endpoint_map.yaml View File

@ -291,18 +291,6 @@ parameters:
protocol: http
port: '8778'
host: IP_ADDRESS
SaharaAdmin:
protocol: http
port: '8386'
host: IP_ADDRESS
SaharaInternal:
protocol: http
port: '8386'
host: IP_ADDRESS
SaharaPublic:
protocol: http
port: '8386'
host: IP_ADDRESS
SwiftAdmin:
protocol: http
port: '8080'
@ -10621,387 +10609,6 @@ outputs:
- EndpointMap
- PlacementPublic
- port
SaharaAdmin:
host:
str_replace:
template:
get_param:
- EndpointMap
- SaharaAdmin
- host
params:
CLOUDNAME:
get_param:
- CloudEndpoints
- get_param:
- ServiceNetMap
- SaharaApiNetwork
IP_ADDRESS:
get_param:
- NetIpMap
- str_replace:
params:
NETWORK:
get_param:
- ServiceNetMap
- SaharaApiNetwork
template: NETWORK_uri
host_nobrackets:
str_replace:
template:
get_param:
- EndpointMap
- SaharaAdmin
- host
params:
CLOUDNAME:
get_param:
- CloudEndpoints
- get_param:
- ServiceNetMap
- SaharaApiNetwork
IP_ADDRESS:
get_param:
- NetIpMap
- get_param:
- ServiceNetMap
- SaharaApiNetwork
port:
get_param:
- EndpointMap
- SaharaAdmin
- port
protocol:
get_param:
- EndpointMap
- SaharaAdmin
- protocol
uri:
make_url:
scheme:
get_param:
- EndpointMap
- SaharaAdmin
- protocol
host:
str_replace:
template:
get_param:
- EndpointMap
- SaharaAdmin
- host
params:
CLOUDNAME:
get_param:
- CloudEndpoints
- get_param:
- ServiceNetMap
- SaharaApiNetwork
IP_ADDRESS:
get_param:
- NetIpMap
- str_replace:
params:
NETWORK:
get_param:
- ServiceNetMap
- SaharaApiNetwork
template: NETWORK_uri
port:
get_param:
- EndpointMap
- SaharaAdmin
- port
uri_no_suffix:
make_url:
scheme:
get_param:
- EndpointMap
- SaharaAdmin
- protocol
host:
str_replace:
template:
get_param:
- EndpointMap
- SaharaAdmin
- host
params:
CLOUDNAME:
get_param:
- CloudEndpoints
- get_param:
- ServiceNetMap
- SaharaApiNetwork
IP_ADDRESS:
get_param:
- NetIpMap
- str_replace:
params:
NETWORK:
get_param:
- ServiceNetMap
- SaharaApiNetwork
template: NETWORK_uri
port:
get_param:
- EndpointMap
- SaharaAdmin
- port
SaharaInternal:
host:
str_replace:
template:
get_param:
- EndpointMap
- SaharaInternal
- host
params:
CLOUDNAME:
get_param:
- CloudEndpoints
- get_param:
- ServiceNetMap
- SaharaApiNetwork
IP_ADDRESS:
get_param:
- NetIpMap
- str_replace:
params:
NETWORK:
get_param:
- ServiceNetMap
- SaharaApiNetwork
template: NETWORK_uri
host_nobrackets:
str_replace:
template:
get_param:
- EndpointMap
- SaharaInternal
- host
params:
CLOUDNAME:
get_param:
- CloudEndpoints
- get_param:
- ServiceNetMap
- SaharaApiNetwork
IP_ADDRESS:
get_param:
- NetIpMap
- get_param:
- ServiceNetMap
- SaharaApiNetwork
port:
get_param:
- EndpointMap
- SaharaInternal
- port
protocol:
get_param:
- EndpointMap
- SaharaInternal
- protocol
uri:
make_url:
scheme:
get_param:
- EndpointMap
- SaharaInternal
- protocol
host:
str_replace:
template:
get_param:
- EndpointMap
- SaharaInternal
- host
params:
CLOUDNAME:
get_param:
- CloudEndpoints
- get_param:
- ServiceNetMap
- SaharaApiNetwork
IP_ADDRESS:
get_param:
- NetIpMap
- str_replace:
params:
NETWORK:
get_param:
- ServiceNetMap
- SaharaApiNetwork
template: NETWORK_uri
port:
get_param:
- EndpointMap
- SaharaInternal
- port
uri_no_suffix:
make_url:
scheme:
get_param:
- EndpointMap
- SaharaInternal
- protocol
host:
str_replace:
template:
get_param:
- EndpointMap
- SaharaInternal
- host
params:
CLOUDNAME:
get_param:
- CloudEndpoints
- get_param:
- ServiceNetMap
- SaharaApiNetwork
IP_ADDRESS:
get_param:
- NetIpMap
- str_replace:
params:
NETWORK:
get_param:
- ServiceNetMap
- SaharaApiNetwork
template: NETWORK_uri
port:
get_param:
- EndpointMap
- SaharaInternal
- port
SaharaPublic:
host:
str_replace:
template:
get_param:
- EndpointMap
- SaharaPublic
- host
params:
CLOUDNAME:
get_param:
- CloudEndpoints
- get_param:
- ServiceNetMap
- PublicNetwork
IP_ADDRESS:
get_param:
- NetIpMap
- str_replace:
params:
NETWORK:
get_param:
- ServiceNetMap
- PublicNetwork
template: NETWORK_uri
host_nobrackets:
str_replace:
template:
get_param:
- EndpointMap
- SaharaPublic
- host
params:
CLOUDNAME:
get_param:
- CloudEndpoints
- get_param:
- ServiceNetMap
- PublicNetwork
IP_ADDRESS:
get_param:
- NetIpMap
- get_param:
- ServiceNetMap
- PublicNetwork
port:
get_param:
- EndpointMap
- SaharaPublic
- port
protocol:
get_param:
- EndpointMap
- SaharaPublic
- protocol
uri:
make_url:
scheme:
get_param:
- EndpointMap
- SaharaPublic
- protocol
host:
str_replace:
template:
get_param:
- EndpointMap
- SaharaPublic
- host
params:
CLOUDNAME:
get_param:
- CloudEndpoints
- get_param:
- ServiceNetMap
- PublicNetwork
IP_ADDRESS:
get_param:
- NetIpMap
- str_replace:
params:
NETWORK:
get_param:
- ServiceNetMap
- PublicNetwork
template: NETWORK_uri
port:
get_param:
- EndpointMap
- SaharaPublic
- port
uri_no_suffix:
make_url:
scheme:
get_param:
- EndpointMap
- SaharaPublic
- protocol
host:
str_replace:
template:
get_param:
- EndpointMap
- SaharaPublic
- host
params:
CLOUDNAME:
get_param:
- CloudEndpoints
- get_param:
- ServiceNetMap
- PublicNetwork
IP_ADDRESS:
get_param:
- NetIpMap
- str_replace:
params:
NETWORK:
get_param:
- ServiceNetMap
- PublicNetwork
template: NETWORK_uri
port:
get_param:
- EndpointMap
- SaharaPublic
- port
SwiftAdmin:
host:
str_replace:


+ 0
- 1
network/service_net_map.j2.yaml View File

@ -61,7 +61,6 @@ parameters:
NovajoinNetwork: {{ _service_nets.get('internal_api', 'ctlplane') }}
SwiftStorageNetwork: {{ _service_nets.get('storage_mgmt', 'ctlplane') }}
SwiftProxyNetwork: {{ _service_nets.get('storage', 'ctlplane') }}
SaharaApiNetwork: {{ _service_nets.get('internal_api', 'ctlplane') }}
HorizonNetwork: {{ _service_nets.get('internal_api', 'ctlplane') }}
MemcachedNetwork: {{ _service_nets.get('internal_api', 'ctlplane') }}
OsloMessagingRpcNetwork: {{ _service_nets.get('internal_api', 'ctlplane') }}


+ 0
- 2
overcloud-resource-registry-puppet.j2.yaml View File

@ -176,8 +176,6 @@ resource_registry:
OS::TripleO::Services::Iscsid: deployment/iscsid/iscsid-container-puppet.yaml
OS::TripleO::Services::Keepalived: OS::Heat::None
OS::TripleO::Services::Memcached: deployment/memcached/memcached-container-puppet.yaml
OS::TripleO::Services::SaharaApi: OS::Heat::None
OS::TripleO::Services::SaharaEngine: OS::Heat::None
OS::TripleO::Services::Tuned: deployment/tuned/tuned-baremetal-ansible.yaml
OS::TripleO::Services::Securetty: OS::Heat::None
# TODO(aschultz): Remove this in U as we switched to a task in the deploy


+ 4
- 0
releasenotes/notes/remove-sahara-ffec9acf94d72905.yaml View File

@ -0,0 +1,4 @@
---
upgrade:
- |
Support for Sahara service has been removed.

+ 0
- 2
roles/Controller.yaml View File

@ -168,8 +168,6 @@
- OS::TripleO::Services::Rhsm
- OS::TripleO::Services::Rsyslog
- OS::TripleO::Services::RsyslogSidecar
- OS::TripleO::Services::SaharaApi
- OS::TripleO::Services::SaharaEngine
- OS::TripleO::Services::Securetty
- OS::TripleO::Services::Snmp
- OS::TripleO::Services::Sshd


+ 0
- 2
roles/ControllerAllNovaStandalone.yaml View File

@ -110,8 +110,6 @@
- OS::TripleO::Services::Rhsm
- OS::TripleO::Services::Rsyslog
- OS::TripleO::Services::RsyslogSidecar
- OS::TripleO::Services::SaharaApi
- OS::TripleO::Services::SaharaEngine
- OS::TripleO::Services::Snmp
- OS::TripleO::Services::Sshd
- OS::TripleO::Services::SwiftProxy


+ 0
- 2
roles/ControllerNoCeph.yaml View File

@ -157,8 +157,6 @@
- OS::TripleO::Services::Rhsm
- OS::TripleO::Services::Rsyslog
- OS::TripleO::Services::RsyslogSidecar
- OS::TripleO::Services::SaharaApi
- OS::TripleO::Services::SaharaEngine
- OS::TripleO::Services::Securetty
- OS::TripleO::Services::Snmp
- OS::TripleO::Services::Sshd


+ 0
- 2
roles/ControllerNovaStandalone.yaml View File

@ -133,8 +133,6 @@
- OS::TripleO::Services::Rhsm
- OS::TripleO::Services::Rsyslog
- OS::TripleO::Services::RsyslogSidecar
- OS::TripleO::Services::SaharaApi
- OS::TripleO::Services::SaharaEngine
- OS::TripleO::Services::Securetty
- OS::TripleO::Services::Snmp
- OS::TripleO::Services::Sshd


+ 0
- 2
roles/ControllerOpenstack.yaml View File

@ -123,8 +123,6 @@
- OS::TripleO::Services::Rhsm
- OS::TripleO::Services::Rsyslog
- OS::TripleO::Services::RsyslogSidecar
- OS::TripleO::Services::SaharaApi
- OS::TripleO::Services::SaharaEngine
- OS::TripleO::Services::Snmp
- OS::TripleO::Services::Sshd
- OS::TripleO::Services::SwiftProxy


+ 0
- 2
roles/ControllerSriov.yaml View File

@ -162,8 +162,6 @@
- OS::TripleO::Services::Rhsm
- OS::TripleO::Services::Rsyslog
- OS::TripleO::Services::RsyslogSidecar
- OS::TripleO::Services::SaharaApi
- OS::TripleO::Services::SaharaEngine
- OS::TripleO::Services::Securetty
- OS::TripleO::Services::Snmp
- OS::TripleO::Services::Sshd


+ 0
- 2
roles/ControllerStorageDashboard.yaml View File

@ -166,8 +166,6 @@
- OS::TripleO::Services::Rhsm
- OS::TripleO::Services::Rsyslog
- OS::TripleO::Services::RsyslogSidecar
- OS::TripleO::Services::SaharaApi
- OS::TripleO::Services::SaharaEngine
- OS::TripleO::Services::Securetty
- OS::TripleO::Services::Snmp
- OS::TripleO::Services::Sshd


+ 0
- 2
roles/ControllerStorageNfs.yaml View File

@ -167,8 +167,6 @@
- OS::TripleO::Services::Rhsm
- OS::TripleO::Services::Rsyslog
- OS::TripleO::Services::RsyslogSidecar
- OS::TripleO::Services::SaharaApi
- OS::TripleO::Services::SaharaEngine
- OS::TripleO::Services::Securetty
- OS::TripleO::Services::Snmp
- OS::TripleO::Services::Sshd


+ 0
- 2
roles/Standalone.yaml View File

@ -168,8 +168,6 @@
- OS::TripleO::Services::Rhsm
- OS::TripleO::Services::Rsyslog
- OS::TripleO::Services::RsyslogSidecar
- OS::TripleO::Services::SaharaApi
- OS::TripleO::Services::SaharaEngine
- OS::TripleO::Services::Securetty
- OS::TripleO::Services::Snmp
- OS::TripleO::Services::Sshd


+ 0
- 2
roles_data.yaml View File

@ -171,8 +171,6 @@
- OS::TripleO::Services::Rhsm
- OS::TripleO::Services::Rsyslog
- OS::TripleO::Services::RsyslogSidecar
- OS::TripleO::Services::SaharaApi
- OS::TripleO::Services::SaharaEngine
- OS::TripleO::Services::Securetty
- OS::TripleO::Services::Snmp
- OS::TripleO::Services::Sshd


+ 0
- 12
sample-env-generator/ssl.yaml View File

@ -192,9 +192,6 @@ environments:
OctaviaAdmin: {protocol: 'http', port: '9876', host: 'IP_ADDRESS'}
OctaviaInternal: {protocol: 'http', port: '9876', host: 'IP_ADDRESS'}
OctaviaPublic: {protocol: 'https', port: '13876', host: 'IP_ADDRESS'}
SaharaAdmin: {protocol: 'http', port: '8386', host: 'IP_ADDRESS'}
SaharaInternal: {protocol: 'http', port: '8386', host: 'IP_ADDRESS'}
SaharaPublic: {protocol: 'https', port: '13386', host: 'IP_ADDRESS'}
SwiftAdmin: {protocol: 'http', port: '8080', host: 'IP_ADDRESS'}
SwiftInternal: {protocol: 'http', port: '8080', host: 'IP_ADDRESS'}
SwiftPublic: {protocol: 'https', port: '13808', host: 'IP_ADDRESS'}
@ -290,9 +287,6 @@ environments:
OctaviaAdmin: {protocol: 'http', port: '9876', host: 'IP_ADDRESS'}
OctaviaInternal: {protocol: 'http', port: '9876', host: 'IP_ADDRESS'}
OctaviaPublic: {protocol: 'https', port: '13876', host: 'CLOUDNAME'}
SaharaAdmin: {protocol: 'http', port: '8386', host: 'IP_ADDRESS'}
SaharaInternal: {protocol: 'http', port: '8386', host: 'IP_ADDRESS'}
SaharaPublic: {protocol: 'https', port: '13386', host: 'CLOUDNAME'}
SwiftAdmin: {protocol: 'http', port: '8080', host: 'IP_ADDRESS'}
SwiftInternal: {protocol: 'http', port: '8080', host: 'IP_ADDRESS'}
SwiftPublic: {protocol: 'https', port: '13808', host: 'CLOUDNAME'}
@ -388,9 +382,6 @@ environments:
OctaviaAdmin: {protocol: 'https', port: '9876', host: 'CLOUDNAME'}
OctaviaInternal: {protocol: 'https', port: '9876', host: 'CLOUDNAME'}
OctaviaPublic: {protocol: 'https', port: '13876', host: 'CLOUDNAME'}
SaharaAdmin: {protocol: 'https', port: '8386', host: 'CLOUDNAME'}
SaharaInternal: {protocol: 'https', port: '8386', host: 'CLOUDNAME'}
SaharaPublic: {protocol: 'https', port: '13386', host: 'CLOUDNAME'}
SwiftAdmin: {protocol: 'https', port: '8080', host: 'CLOUDNAME'}
SwiftInternal: {protocol: 'https', port: '8080', host: 'CLOUDNAME'}
SwiftPublic: {protocol: 'https', port: '13808', host: 'CLOUDNAME'}
@ -496,9 +487,6 @@ environments:
OctaviaAdmin: {protocol: http, port: '9876', host: IP_ADDRESS}
OctaviaInternal: {protocol: http, port: '9876', host: IP_ADDRESS}
OctaviaPublic: {protocol: http, port: '9876', host: IP_ADDRESS}
SaharaAdmin: {protocol: http, port: '8386', host: IP_ADDRESS}
SaharaInternal: {protocol: http, port: '8386', host: IP_ADDRESS}
SaharaPublic: {protocol: http, port: '8386', host: IP_ADDRESS}
SwiftAdmin: {protocol: http, port: '8080', host: IP_ADDRESS}
SwiftInternal: {protocol: http, port: '8080', host: IP_ADDRESS}
SwiftPublic: {protocol: http, port: '8080', host: IP_ADDRESS}


+ 0
- 6
sample-env-generator/standalone.yaml View File

@ -143,9 +143,6 @@ environments:
OS::TripleO::Services::Redis: OS::Heat::None
# Rsyslog
OS::TripleO::Services::Rsyslog: ../../deployment/logging/rsyslog-baremetal-ansible.yaml
# Sahara
OS::TripleO::Services::SaharaApi: OS::Heat::None
OS::TripleO::Services::SaharaEngine: OS::Heat::None
# Zaqar
OS::TripleO::Services::Zaqar: OS::Heat::None
# Don't create OVN Chassis MAC address nets/ports on the standalone
@ -259,9 +256,6 @@ environments:
OS::TripleO::Services::MistralEngine: OS::Heat::None
OS::TripleO::Services::MistralEventEngine: OS::Heat::None
OS::TripleO::Services::MistralExecutor: OS::Heat::None
# Sahara
OS::TripleO::Services::SaharaApi: OS::Heat::None
OS::TripleO::Services::SaharaEngine: OS::Heat::None
# Zaqar
OS::TripleO::Services::Zaqar: OS::Heat::None


+ 0
- 2
sample-env-generator/undercloud-minion.yaml View File

@ -266,8 +266,6 @@ environments:
OS::TripleO::Services::RabbitMQ: OS::Heat::None
OS::TripleO::Services::Redis: OS::Heat::None
OS::TripleO::Services::RsyslogSidecar: OS::Heat::None
OS::TripleO::Services::SaharaApi: OS::Heat::None
OS::TripleO::Services::SaharaEngine: OS::Heat::None
OS::TripleO::Services::Securetty: OS::Heat::None
OS::TripleO::Services::SELinux: OS::Heat::None
OS::TripleO::Services::Snmp: OS::Heat::None


+ 0
- 2
tools/yaml-validate.py View File

@ -171,8 +171,6 @@ PARAMETER_DEFINITION_EXCLUSIONS = {
'OctaviaWorkerLoggingSource': ['default'],
'OvnMetadataAgentLoggingSource': ['default'],
'PlacementLoggingSource': ['default'],
'SaharaApiLoggingSource': ['default'],
'SaharaEngineLoggingSource': ['default'],
# There's one template that defines this
# differently, and I'm not sure if we can
# safely change it.


Loading…
Cancel
Save