diff --git a/README.rst b/README.rst index acb5cf3acd..31e6fd4274 100644 --- a/README.rst +++ b/README.rst @@ -120,8 +120,6 @@ and should be executed according to the following table: +----------------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+ | barbican | | | X | | | | | | | | | | +----------------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+ -| zaqar | | | X | | | | | | | | | | -+----------------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+ | cephrgw | | | | | X | | | | | | | | +----------------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+ | cephmds | | | | | X | | | | | | | | diff --git a/ci/environments/scenario000-standalone.yaml b/ci/environments/scenario000-standalone.yaml index 87eb945a17..9cd9448c5f 100644 --- a/ci/environments/scenario000-standalone.yaml +++ b/ci/environments/scenario000-standalone.yaml @@ -176,7 +176,6 @@ resource_registry: OS::TripleO::Services::UndercloudUpgrade: OS::Heat::None OS::TripleO::Services::Vpp: OS::Heat::None OS::TripleO::Services::Xinetd: OS::Heat::None - OS::TripleO::Services::Zaqar: OS::Heat::None parameter_defaults: Debug: true NotificationDriver: 'noop' diff --git a/ci/environments/scenario002-standalone.yaml b/ci/environments/scenario002-standalone.yaml index e0a67e7695..e7e24b5626 100644 --- a/ci/environments/scenario002-standalone.yaml +++ b/ci/environments/scenario002-standalone.yaml @@ -14,7 +14,6 @@ resource_registry: OS::TripleO::Services::HeatApiCloudwatch: ../../deployment/heat/heat-api-cloudwatch-disabled-puppet.yaml OS::TripleO::Services::HeatEngine: ../../deployment/heat/heat-engine-container-puppet.yaml OS::TripleO::Services::BarbicanApi: ../../deployment/barbican/barbican-api-container-puppet.yaml - OS::TripleO::Services::Zaqar: ../../deployment/deprecated/zaqar/zaqar-container-puppet.yaml OS::TripleO::Services::OsloMessagingRpc: ../../deployment/rabbitmq/rabbitmq-messaging-rpc-pacemaker-puppet.yaml OS::TripleO::Services::OsloMessagingNotify: ../../deployment/rabbitmq/rabbitmq-messaging-notify-shared-puppet.yaml OS::TripleO::Services::Redis: ../../deployment/database/redis-pacemaker-puppet.yaml @@ -44,8 +43,6 @@ parameter_defaults: - gnocchi://?archive_policy=ceilometer-high-rate Debug: true DockerPuppetDebug: true - ZaqarMessageStore: 'swift' - ZaqarManagementStore: 'sqlalchemy' SwiftCeilometerPipelineEnabled: false BarbicanSimpleCryptoGlobalDefault: true ContainerCli: podman diff --git a/deployment/ceilometer/ceilometer-agent-notification-container-puppet.yaml b/deployment/ceilometer/ceilometer-agent-notification-container-puppet.yaml index ba1cb70a3c..5977659fdc 100644 --- a/deployment/ceilometer/ceilometer-agent-notification-container-puppet.yaml +++ b/deployment/ceilometer/ceilometer-agent-notification-container-puppet.yaml @@ -75,8 +75,6 @@ parameters: description: > A list of publishers to put in event_pipeline.yaml. When the collector is used, override this with notifier:// publisher. - If zaqar is enabled, you can also publish to a zaqar queue - by including "zaqar://?queue=queue_name" in this list. Set ManageEventPipeline to true for override to take effect. type: comma_delimited_list ManagePipeline: diff --git a/deployment/deprecated/zaqar/zaqar-container-puppet.yaml b/deployment/deprecated/zaqar/zaqar-container-puppet.yaml deleted file mode 100644 index 35cfd921c1..0000000000 --- a/deployment/deprecated/zaqar/zaqar-container-puppet.yaml +++ /dev/null @@ -1,398 +0,0 @@ -heat_template_version: wallaby - -description: > - OpenStack containerized Zaqar services - -parameters: - ContainerZaqarImage: - description: image - type: string - ContainerZaqarConfigImage: - description: The container image to use for the zaqar config_volume - type: string - 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. Use - parameter_merge_strategies to merge it with the defaults. - 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. - Debug: - type: boolean - description: Set to True to enable debugging on all services. - default: false - ZaqarDebug: - default: false - description: Set to True to enable debugging Zaqar service. - type: boolean - EnableSQLAlchemyCollectd: - type: boolean - description: > - Set to true to enable the SQLAlchemy-collectd server plugin - default: false - ZaqarPassword: - description: The password for Zaqar - type: string - hidden: true - KeystoneRegion: - type: string - default: 'regionOne' - description: Keystone region for endpoint - ZaqarPolicies: - description: | - A hash of policies to configure for Zaqar. - e.g. { zaqar-context_is_admin: { key: context_is_admin, value: 'role:admin' } } - default: {} - type: json - ZaqarWorkers: - type: string - description: Set the number of workers for zaqar::wsgi::apache - default: '%{::os_workers}' - ZaqarMessageStore: - type: string - description: The messaging store for Zaqar - default: redis - ZaqarManagementStore: - type: string - description: The management store for Zaqar - default: redis - EnableInternalTLS: - type: boolean - default: false - RedisPassword: - description: The password for the redis service account. - type: string - hidden: true - MemcacheUseAdvancedPool: - type: boolean - description: | - Use the advanced (eventlet safe) memcached client pool. - default: true - -conditions: - internal_tls_enabled: {get_param: EnableInternalTLS} - zaqar_management_store_sqlalchemy: {equals : [{get_param: ZaqarManagementStore}, 'sqlalchemy']} - zaqar_workers_zero: {equals : [{get_param: ZaqarWorkers}, 0]} - zaqar_messaging_store_swift: {equals : [{get_param: ZaqarMessageStore}, 'swift']} - zaqar_messaging_store_redis: {equals : [{get_param: ZaqarMessageStore}, 'redis']} - enable_sqlalchemy_collectd: {equals : [{get_param: EnableSQLAlchemyCollectd}, true]} - -resources: - - ApacheServiceBase: - type: ../../../deployment/apache/apache-baremetal-puppet.yaml - properties: - ServiceData: {get_param: ServiceData} - ServiceNetMap: {get_param: ServiceNetMap} - EndpointMap: {get_param: EndpointMap} - EnableInternalTLS: {get_param: EnableInternalTLS} - - ContainersCommon: - type: ../../containers-common.yaml - - MySQLClient: - type: ../../database/mysql-client.yaml - -outputs: - role_data: - description: Role data for the Zaqar API role. - value: - service_name: zaqar_api - firewall_rules: - '113 zaqar_api': - dport: - - 9000 - - 8888 - - 3000 #SSL for websocket - - 13888 #SSL for api - keystone_resources: - zaqar: - endpoints: - public: {get_param: [EndpointMap, ZaqarPublic, uri]} - internal: {get_param: [EndpointMap, ZaqarInternal, uri]} - admin: {get_param: [EndpointMap, ZaqarAdmin, uri]} - users: - zaqar: - password: {get_param: ZaqarPassword} - region: {get_param: KeystoneRegion} - service: 'messaging' - zaqar-websocket: - endpoints: - public: {get_param: [EndpointMap, ZaqarWebSocketPublic, uri]} - internal: {get_param: [EndpointMap, ZaqarWebSocketInternal, uri]} - admin: {get_param: [EndpointMap, ZaqarWebSocketAdmin, uri]} - users: - zaqar-websocket: - password: {get_param: ZaqarPassword} - region: {get_param: KeystoneRegion} - service: 'messaging-websocket' - config_settings: - map_merge: - - get_attr: [ApacheServiceBase, role_data, config_settings] - - zaqar::policy::policies: {get_param: ZaqarPolicies} - zaqar::keystone::authtoken::password: {get_param: ZaqarPassword} - zaqar::keystone::authtoken::project_name: 'service' - zaqar::keystone::authtoken::auth_url: {get_param: [EndpointMap, KeystoneInternal, uri_no_suffix]} - zaqar::keystone::authtoken::www_authenticate_uri: {get_param: [EndpointMap, KeystoneInternal, uri]} - zaqar::keystone::authtoken::region_name: {get_param: KeystoneRegion} - zaqar::keystone::authtoken::interface: 'internal' - zaqar::keystone::authtoken::memcache_use_advanced_pool: {get_param: MemcacheUseAdvancedPool} - zaqar::keystone::trust::auth_url: {get_param: [EndpointMap, KeystoneInternal, uri_no_suffix]} - zaqar::logging::debug: - if: - - {get_param: ZaqarDebug } - - true - - {get_param: Debug } - zaqar::server::service_name: 'httpd' - zaqar::transport::websocket::bind: - str_replace: - template: - "%{hiera('$NETWORK')}" - params: - $NETWORK: {get_param: [ServiceNetMap, ZaqarApiNetwork]} - zaqar::transport::websocket::notification_bind: - str_replace: - template: - "%{hiera('$NETWORK')}" - params: - $NETWORK: {get_param: [ServiceNetMap, ZaqarApiNetwork]} - zaqar::wsgi::apache::ssl: {get_param: EnableInternalTLS} - zaqar::wsgi::apache::bind_host: - str_replace: - template: - "%{hiera('$NETWORK')}" - params: - $NETWORK: {get_param: [ServiceNetMap, ZaqarApiNetwork]} - zaqar::message_pipeline: 'zaqar.notification.notifier' - zaqar::max_messages_post_size: 2097152 - zaqar::unreliable: true - zaqar::wsgi::apache::servername: - str_replace: - template: - "%{hiera('fqdn_$NETWORK')}" - params: - $NETWORK: {get_param: [ServiceNetMap, ZaqarApiNetwork]} - zaqar::message_store: {get_param: ZaqarMessageStore} - zaqar::management_store: {get_param: ZaqarManagementStore} - - - if: - - zaqar_messaging_store_swift - - - zaqar::messaging::swift::uri: - list_join: - - '' - - ['swift://zaqar:', {get_param: ZaqarPassword}, '@/service'] - zaqar::messaging::swift::auth_url: {get_param: [EndpointMap, KeystoneInternal, uri_no_suffix] } - tripleo::profile::base::zaqar::messaging_store: 'swift' - - {} - - - if: - - zaqar_messaging_store_redis - - - zaqar_redis_password: {get_param: RedisPassword} - tripleo::profile::base::zaqar::messaging_store: 'redis' - - {} - - - if: - - zaqar_management_store_sqlalchemy - - - tripleo::profile::base::zaqar::management_store: 'sqlalchemy' - zaqar::management::sqlalchemy::uri: - make_url: - scheme: {get_param: [EndpointMap, MysqlInternal, protocol]} - username: zaqar - password: {get_param: ZaqarPassword} - host: {get_param: [EndpointMap, MysqlInternal, host]} - path: /zaqar - query: - if: - - enable_sqlalchemy_collectd - - - read_default_file: /etc/my.cnf.d/tripleo.cnf - read_default_group: tripleo - plugin: collectd - collectd_program_name: zaqar - collectd_host: localhost - - - read_default_file: /etc/my.cnf.d/tripleo.cnf - read_default_group: tripleo - - - {} - - - if: - - zaqar_workers_zero - - {} - - zaqar::wsgi::apache::workers: {get_param: ZaqarWorkers} - service_config_settings: - map_merge: - - keystone: - zaqar::keystone::trust::password: {get_param: ZaqarPassword} - zaqar::keystone::trust::user_domain_name: 'Default' - - - if: - - zaqar_management_store_sqlalchemy - - mysql: - zaqar::db::mysql::user: zaqar - zaqar::db::mysql::host: '%' - zaqar::db::mysql::dbname: zaqar - zaqar::db::mysql::password: {get_param: ZaqarPassword} - - {} - # BEGIN DOCKER SETTINGS - puppet_config: - config_volume: zaqar - puppet_tags: zaqar_config - step_config: - list_join: - - "\n" - - - include tripleo::profile::base::zaqar - - {get_attr: [MySQLClient, role_data, step_config]} - config_image: {get_param: ContainerZaqarConfigImage} - kolla_config: - /var/lib/kolla/config_files/zaqar.json: - command: /usr/sbin/httpd -DFOREGROUND - config_files: &zaqar_config_files - - source: "/var/lib/kolla/config_files/src/etc/httpd/conf.d" - dest: "/etc/httpd/conf.d" - merge: false - preserve_properties: true - - source: "/var/lib/kolla/config_files/src/etc/httpd/conf.modules.d" - dest: "/etc/httpd/conf.modules.d" - merge: false - preserve_properties: true - - source: "/var/lib/kolla/config_files/src/*" - dest: "/" - merge: true - preserve_properties: true - /var/lib/kolla/config_files/zaqar_db_sync.json: - command: "/usr/bin/bootstrap_host_exec zaqar_api su zaqar -s /bin/bash -c 'zaqar-sql-db-manage upgrade head'" - config_files: *zaqar_config_files - /var/lib/kolla/config_files/zaqar_websocket.json: - command: /usr/bin/zaqar-server --config-file /etc/zaqar/zaqar.conf --config-file /etc/zaqar/1.conf - config_files: - - source: "/var/lib/kolla/config_files/src/*" - dest: "/" - merge: true - preserve_properties: true - permissions: - - path: /var/log/zaqar - owner: zaqar:zaqar - recurse: true - docker_config: - map_merge: - - - if: - - zaqar_management_store_sqlalchemy - - - step_2: - zaqar_init_log: - image: &zaqar_image {get_param: ContainerZaqarImage} - net: none - user: root - volumes: - - /var/log/containers/zaqar:/var/log/zaqar - - /var/log/containers/httpd/zaqar:/var/log/httpd - command: ['/bin/bash', '-c', 'chmod 2755 /var/log/zaqar; touch /var/log/zaqar/zaqar-server.log; chown -R zaqar:zaqar /var/log/zaqar'] - step_3: - zaqar_db_sync: - image: *zaqar_image - net: host - privileged: false - detach: false - user: root - volumes: - list_concat: - - {get_attr: [ContainersCommon, volumes]} - - - - /var/lib/kolla/config_files/zaqar_db_sync.json:/var/lib/kolla/config_files/config.json:ro - - /var/lib/config-data/puppet-generated/zaqar:/var/lib/kolla/config_files/src:ro - - /var/log/containers/zaqar:/var/log/zaqar - environment: - KOLLA_CONFIG_STRATEGY: COPY_ALWAYS - TRIPLEO_DEPLOY_IDENTIFIER: {get_param: DeployIdentifier} - - {} - - step_4: - zaqar: - image: *zaqar_image - net: host - privileged: false - restart: always - # NOTE(mandre) kolla image changes the user to 'zaqar', we need it - # to be root to run httpd - user: root - healthcheck: - test: /usr/share/openstack-tripleo-common/healthcheck/zaqar-api - volumes: - list_concat: - - {get_attr: [ContainersCommon, volumes]} - - - - /var/lib/kolla/config_files/zaqar.json:/var/lib/kolla/config_files/config.json:ro - - /var/lib/config-data/puppet-generated/zaqar:/var/lib/kolla/config_files/src:ro - - /var/log/containers/zaqar:/var/log/zaqar - - /var/log/containers/httpd/zaqar:/var/log/httpd - - if: - - internal_tls_enabled - - - /etc/pki/tls/certs/httpd:/etc/pki/tls/certs/httpd:ro - - [] - - if: - - internal_tls_enabled - - - /etc/pki/tls/private/httpd:/etc/pki/tls/private/httpd:ro - - [] - environment: - KOLLA_CONFIG_STRATEGY: COPY_ALWAYS - zaqar_websocket: - image: *zaqar_image - net: host - privileged: false - restart: always - healthcheck: - test: - list_join: - - ' ' - - - '/usr/share/openstack-tripleo-common/healthcheck/zaqar-api' - - {get_param: [EndpointMap, ZaqarWebSocketInternal, port]} - volumes: - list_concat: - - {get_attr: [ContainersCommon, volumes]} - - - - /var/lib/kolla/config_files/zaqar_websocket.json:/var/lib/kolla/config_files/config.json:ro - - /var/lib/config-data/puppet-generated/zaqar:/var/lib/kolla/config_files/src:ro - - /var/log/containers/zaqar:/var/log/zaqar - - /var/log/containers/httpd/zaqar:/var/log/httpd - 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 }}" - with_items: - - { 'path': /var/log/containers/zaqar, 'setype': container_file_t, 'mode': '0750' } - - { 'path': /var/log/containers/httpd/zaqar, 'setype': container_file_t, 'mode': '0750' } - metadata_settings: - get_attr: [ApacheServiceBase, role_data, metadata_settings] - deploy_steps_tasks: - get_attr: [ApacheServiceBase, role_data, deploy_steps_tasks] diff --git a/deployment/haproxy/haproxy-container-puppet.yaml b/deployment/haproxy/haproxy-container-puppet.yaml index 4ebce5770c..1daa037b37 100644 --- a/deployment/haproxy/haproxy-container-puppet.yaml +++ b/deployment/haproxy/haproxy-container-puppet.yaml @@ -105,10 +105,6 @@ parameters: default: '/etc/pki/CA/crl/' type: string description: The directory of the CRL PEM file to be mounted. - ZaqarWsTimeout: - default: '14400' - type: string - description: The tunnel timeout in seconds for the Zaqar API. conditions: public_tls_enabled: @@ -172,7 +168,6 @@ outputs: tripleo::haproxy::redis_password: {get_param: RedisPassword} tripleo::haproxy::crl_file: {get_param: InternalTLSCRLPEMFile} tripleo::haproxy::haproxy_stats: {get_param: HAProxyStatsEnabled} - tripleo::haproxy::zaqar_ws_timeout_tunnel: {get_param: ZaqarWsTimeout} enable_load_balancer: {get_param: EnableLoadBalancer} tripleo::profile::base::haproxy::certificates_specs: map_merge: diff --git a/deployment/haproxy/haproxy-edge-container-puppet.yaml b/deployment/haproxy/haproxy-edge-container-puppet.yaml index c75ac28618..07563761d5 100644 --- a/deployment/haproxy/haproxy-edge-container-puppet.yaml +++ b/deployment/haproxy/haproxy-edge-container-puppet.yaml @@ -113,8 +113,6 @@ outputs: tripleo::haproxy::rabbitmq: false tripleo::haproxy::redis: false tripleo::haproxy::swift_proxy_server: false - tripleo::haproxy::zaqar_api: false - tripleo::haproxy::zaqar_ws: false service_config_settings: map_merge: - get_attr: [HAProxyBase, role_data, service_config_settings] diff --git a/environments/services/zaqar-swift-backend.yaml b/environments/services/zaqar-swift-backend.yaml deleted file mode 100644 index fdc36a9fe3..0000000000 --- a/environments/services/zaqar-swift-backend.yaml +++ /dev/null @@ -1,4 +0,0 @@ -# Env file to enable zaqar without makins use of Redis as a backend -resource_registry: - OS::TripleO::Services::Zaqar: ../../deployment/deprecated/zaqar/zaqar-container-puppet.yaml - OS::TripleO::Services::Redis: OS::Heat::None diff --git a/environments/services/zaqar.yaml b/environments/services/zaqar.yaml deleted file mode 100644 index 963babaa34..0000000000 --- a/environments/services/zaqar.yaml +++ /dev/null @@ -1,3 +0,0 @@ -resource_registry: - OS::TripleO::Services::Zaqar: ../../deployment/deprecated/zaqar/zaqar-container-puppet.yaml - OS::TripleO::Services::Redis : ../../deployment/database/redis-container-puppet.yaml diff --git a/environments/ssl/tls-endpoints-public-dns.yaml b/environments/ssl/tls-endpoints-public-dns.yaml index a129e37b70..a88c8644bb 100644 --- a/environments/ssl/tls-endpoints-public-dns.yaml +++ b/environments/ssl/tls-endpoints-public-dns.yaml @@ -37,8 +37,6 @@ parameter_defaults: NovaVNCProxyPublic: {protocol: 'https', port: '13080', host: 'CLOUDNAME'} OctaviaPublic: {protocol: 'https', port: '13876', host: 'CLOUDNAME'} SwiftPublic: {protocol: 'https', port: '13808', host: 'CLOUDNAME'} - ZaqarPublic: {protocol: 'https', port: '13888', host: 'CLOUDNAME'} - ZaqarWebSocketPublic: {protocol: 'wss', port: '3000', host: 'CLOUDNAME'} parameter_merge_strategies: EndpointMap: merge diff --git a/environments/ssl/tls-endpoints-public-ip.yaml b/environments/ssl/tls-endpoints-public-ip.yaml index af689328e2..e342841011 100644 --- a/environments/ssl/tls-endpoints-public-ip.yaml +++ b/environments/ssl/tls-endpoints-public-ip.yaml @@ -37,8 +37,6 @@ parameter_defaults: NovaVNCProxyPublic: {protocol: 'https', port: '13080', host: 'IP_ADDRESS'} OctaviaPublic: {protocol: 'https', port: '13876', host: 'IP_ADDRESS'} SwiftPublic: {protocol: 'https', port: '13808', host: 'IP_ADDRESS'} - ZaqarPublic: {protocol: 'https', port: '13888', host: 'IP_ADDRESS'} - ZaqarWebSocketPublic: {protocol: 'wss', port: '3000', host: 'IP_ADDRESS'} parameter_merge_strategies: EndpointMap: merge diff --git a/environments/ssl/tls-everywhere-endpoints-dns.yaml b/environments/ssl/tls-everywhere-endpoints-dns.yaml index a000c7c303..4db0d26533 100644 --- a/environments/ssl/tls-everywhere-endpoints-dns.yaml +++ b/environments/ssl/tls-everywhere-endpoints-dns.yaml @@ -80,12 +80,6 @@ parameter_defaults: SwiftAdmin: {protocol: 'https', port: '8080', host: 'CLOUDNAME'} SwiftInternal: {protocol: 'https', port: '8080', host: 'CLOUDNAME'} SwiftPublic: {protocol: 'https', port: '13808', host: 'CLOUDNAME'} - ZaqarAdmin: {protocol: 'https', port: '8888', host: 'CLOUDNAME'} - ZaqarInternal: {protocol: 'https', port: '8888', host: 'CLOUDNAME'} - ZaqarPublic: {protocol: 'https', port: '13888', host: 'CLOUDNAME'} - ZaqarWebSocketAdmin: {protocol: 'wss', port: '9000', host: 'CLOUDNAME'} - ZaqarWebSocketInternal: {protocol: 'wss', port: '9000', host: 'CLOUDNAME'} - ZaqarWebSocketPublic: {protocol: 'wss', port: '3000', host: 'CLOUDNAME'} parameter_merge_strategies: EndpointMap: merge diff --git a/environments/standalone/standalone-overcloud.yaml b/environments/standalone/standalone-overcloud.yaml index d2098146c7..43bc55b594 100644 --- a/environments/standalone/standalone-overcloud.yaml +++ b/environments/standalone/standalone-overcloud.yaml @@ -94,4 +94,3 @@ resource_registry: OS::TripleO::Services::ManilaScheduler: OS::Heat::None OS::TripleO::Services::ManilaShare: OS::Heat::None OS::TripleO::Services::OpenStackClients: ../../deployment/clients/openstack-clients-baremetal-ansible.yaml - OS::TripleO::Services::Zaqar: OS::Heat::None diff --git a/environments/standalone/standalone-tripleo.yaml b/environments/standalone/standalone-tripleo.yaml index 94bdb9e5d4..fb7456852c 100644 --- a/environments/standalone/standalone-tripleo.yaml +++ b/environments/standalone/standalone-tripleo.yaml @@ -110,4 +110,3 @@ resource_registry: OS::TripleO::Services::Redis: OS::Heat::None OS::TripleO::Services::Rsyslog: ../../deployment/logging/rsyslog-baremetal-ansible.yaml OS::TripleO::Services::Tmpwatch: ../../deployment/logrotate/tmpwatch-install.yaml - OS::TripleO::Services::Zaqar: OS::Heat::None diff --git a/environments/undercloud/undercloud-minion.yaml b/environments/undercloud/undercloud-minion.yaml index 97802adab5..6b40648b7f 100644 --- a/environments/undercloud/undercloud-minion.yaml +++ b/environments/undercloud/undercloud-minion.yaml @@ -287,4 +287,3 @@ resource_registry: OS::TripleO::Services::UndercloudUpgrade: OS::Heat::None OS::TripleO::Services::Vpp: OS::Heat::None OS::TripleO::Services::Xinetd: OS::Heat::None - OS::TripleO::Services::Zaqar: OS::Heat::None diff --git a/network/endpoints/endpoint_map.yaml b/network/endpoints/endpoint_map.yaml index 177d005765..b30d45b609 100644 --- a/network/endpoints/endpoint_map.yaml +++ b/network/endpoints/endpoint_map.yaml @@ -10674,765 +10674,3 @@ outputs: - EndpointMap - SwiftPublic - port - ZaqarAdmin: - host: - str_replace: - template: - get_param: - - EndpointMap - - ZaqarAdmin - - host - params: - CLOUDNAME: - get_param: - - CloudEndpoints - - get_param: - - ServiceNetMap - - ZaqarApiNetwork - IP_ADDRESS: - get_param: - - NetIpMap - - str_replace: - params: - NETWORK: - get_param: - - ServiceNetMap - - ZaqarApiNetwork - template: NETWORK_uri - host_nobrackets: - str_replace: - template: - get_param: - - EndpointMap - - ZaqarAdmin - - host - params: - CLOUDNAME: - get_param: - - CloudEndpoints - - get_param: - - ServiceNetMap - - ZaqarApiNetwork - IP_ADDRESS: - get_param: - - NetIpMap - - get_param: - - ServiceNetMap - - ZaqarApiNetwork - port: - get_param: - - EndpointMap - - ZaqarAdmin - - port - protocol: - get_param: - - EndpointMap - - ZaqarAdmin - - protocol - uri: - make_url: - scheme: - get_param: - - EndpointMap - - ZaqarAdmin - - protocol - host: - str_replace: - template: - get_param: - - EndpointMap - - ZaqarAdmin - - host - params: - CLOUDNAME: - get_param: - - CloudEndpoints - - get_param: - - ServiceNetMap - - ZaqarApiNetwork - IP_ADDRESS: - get_param: - - NetIpMap - - str_replace: - params: - NETWORK: - get_param: - - ServiceNetMap - - ZaqarApiNetwork - template: NETWORK_uri - port: - get_param: - - EndpointMap - - ZaqarAdmin - - port - uri_no_suffix: - make_url: - scheme: - get_param: - - EndpointMap - - ZaqarAdmin - - protocol - host: - str_replace: - template: - get_param: - - EndpointMap - - ZaqarAdmin - - host - params: - CLOUDNAME: - get_param: - - CloudEndpoints - - get_param: - - ServiceNetMap - - ZaqarApiNetwork - IP_ADDRESS: - get_param: - - NetIpMap - - str_replace: - params: - NETWORK: - get_param: - - ServiceNetMap - - ZaqarApiNetwork - template: NETWORK_uri - port: - get_param: - - EndpointMap - - ZaqarAdmin - - port - ZaqarInternal: - host: - str_replace: - template: - get_param: - - EndpointMap - - ZaqarInternal - - host - params: - CLOUDNAME: - get_param: - - CloudEndpoints - - get_param: - - ServiceNetMap - - ZaqarApiNetwork - IP_ADDRESS: - get_param: - - NetIpMap - - str_replace: - params: - NETWORK: - get_param: - - ServiceNetMap - - ZaqarApiNetwork - template: NETWORK_uri - host_nobrackets: - str_replace: - template: - get_param: - - EndpointMap - - ZaqarInternal - - host - params: - CLOUDNAME: - get_param: - - CloudEndpoints - - get_param: - - ServiceNetMap - - ZaqarApiNetwork - IP_ADDRESS: - get_param: - - NetIpMap - - get_param: - - ServiceNetMap - - ZaqarApiNetwork - port: - get_param: - - EndpointMap - - ZaqarInternal - - port - protocol: - get_param: - - EndpointMap - - ZaqarInternal - - protocol - uri: - make_url: - scheme: - get_param: - - EndpointMap - - ZaqarInternal - - protocol - host: - str_replace: - template: - get_param: - - EndpointMap - - ZaqarInternal - - host - params: - CLOUDNAME: - get_param: - - CloudEndpoints - - get_param: - - ServiceNetMap - - ZaqarApiNetwork - IP_ADDRESS: - get_param: - - NetIpMap - - str_replace: - params: - NETWORK: - get_param: - - ServiceNetMap - - ZaqarApiNetwork - template: NETWORK_uri - port: - get_param: - - EndpointMap - - ZaqarInternal - - port - uri_no_suffix: - make_url: - scheme: - get_param: - - EndpointMap - - ZaqarInternal - - protocol - host: - str_replace: - template: - get_param: - - EndpointMap - - ZaqarInternal - - host - params: - CLOUDNAME: - get_param: - - CloudEndpoints - - get_param: - - ServiceNetMap - - ZaqarApiNetwork - IP_ADDRESS: - get_param: - - NetIpMap - - str_replace: - params: - NETWORK: - get_param: - - ServiceNetMap - - ZaqarApiNetwork - template: NETWORK_uri - port: - get_param: - - EndpointMap - - ZaqarInternal - - port - ZaqarPublic: - host: - str_replace: - template: - get_param: - - EndpointMap - - ZaqarPublic - - 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 - - ZaqarPublic - - host - params: - CLOUDNAME: - get_param: - - CloudEndpoints - - get_param: - - ServiceNetMap - - PublicNetwork - IP_ADDRESS: - get_param: - - NetIpMap - - get_param: - - ServiceNetMap - - PublicNetwork - port: - get_param: - - EndpointMap - - ZaqarPublic - - port - protocol: - get_param: - - EndpointMap - - ZaqarPublic - - protocol - uri: - make_url: - scheme: - get_param: - - EndpointMap - - ZaqarPublic - - protocol - host: - str_replace: - template: - get_param: - - EndpointMap - - ZaqarPublic - - 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 - - ZaqarPublic - - port - uri_no_suffix: - make_url: - scheme: - get_param: - - EndpointMap - - ZaqarPublic - - protocol - host: - str_replace: - template: - get_param: - - EndpointMap - - ZaqarPublic - - 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 - - ZaqarPublic - - port - ZaqarWebSocketAdmin: - host: - str_replace: - template: - get_param: - - EndpointMap - - ZaqarWebSocketAdmin - - host - params: - CLOUDNAME: - get_param: - - CloudEndpoints - - get_param: - - ServiceNetMap - - ZaqarApiNetwork - IP_ADDRESS: - get_param: - - NetIpMap - - str_replace: - params: - NETWORK: - get_param: - - ServiceNetMap - - ZaqarApiNetwork - template: NETWORK_uri - host_nobrackets: - str_replace: - template: - get_param: - - EndpointMap - - ZaqarWebSocketAdmin - - host - params: - CLOUDNAME: - get_param: - - CloudEndpoints - - get_param: - - ServiceNetMap - - ZaqarApiNetwork - IP_ADDRESS: - get_param: - - NetIpMap - - get_param: - - ServiceNetMap - - ZaqarApiNetwork - port: - get_param: - - EndpointMap - - ZaqarWebSocketAdmin - - port - protocol: - get_param: - - EndpointMap - - ZaqarWebSocketAdmin - - protocol - uri: - make_url: - scheme: - get_param: - - EndpointMap - - ZaqarWebSocketAdmin - - protocol - host: - str_replace: - template: - get_param: - - EndpointMap - - ZaqarWebSocketAdmin - - host - params: - CLOUDNAME: - get_param: - - CloudEndpoints - - get_param: - - ServiceNetMap - - ZaqarApiNetwork - IP_ADDRESS: - get_param: - - NetIpMap - - str_replace: - params: - NETWORK: - get_param: - - ServiceNetMap - - ZaqarApiNetwork - template: NETWORK_uri - port: - get_param: - - EndpointMap - - ZaqarWebSocketAdmin - - port - uri_no_suffix: - make_url: - scheme: - get_param: - - EndpointMap - - ZaqarWebSocketAdmin - - protocol - host: - str_replace: - template: - get_param: - - EndpointMap - - ZaqarWebSocketAdmin - - host - params: - CLOUDNAME: - get_param: - - CloudEndpoints - - get_param: - - ServiceNetMap - - ZaqarApiNetwork - IP_ADDRESS: - get_param: - - NetIpMap - - str_replace: - params: - NETWORK: - get_param: - - ServiceNetMap - - ZaqarApiNetwork - template: NETWORK_uri - port: - get_param: - - EndpointMap - - ZaqarWebSocketAdmin - - port - ZaqarWebSocketInternal: - host: - str_replace: - template: - get_param: - - EndpointMap - - ZaqarWebSocketInternal - - host - params: - CLOUDNAME: - get_param: - - CloudEndpoints - - get_param: - - ServiceNetMap - - ZaqarApiNetwork - IP_ADDRESS: - get_param: - - NetIpMap - - str_replace: - params: - NETWORK: - get_param: - - ServiceNetMap - - ZaqarApiNetwork - template: NETWORK_uri - host_nobrackets: - str_replace: - template: - get_param: - - EndpointMap - - ZaqarWebSocketInternal - - host - params: - CLOUDNAME: - get_param: - - CloudEndpoints - - get_param: - - ServiceNetMap - - ZaqarApiNetwork - IP_ADDRESS: - get_param: - - NetIpMap - - get_param: - - ServiceNetMap - - ZaqarApiNetwork - port: - get_param: - - EndpointMap - - ZaqarWebSocketInternal - - port - protocol: - get_param: - - EndpointMap - - ZaqarWebSocketInternal - - protocol - uri: - make_url: - scheme: - get_param: - - EndpointMap - - ZaqarWebSocketInternal - - protocol - host: - str_replace: - template: - get_param: - - EndpointMap - - ZaqarWebSocketInternal - - host - params: - CLOUDNAME: - get_param: - - CloudEndpoints - - get_param: - - ServiceNetMap - - ZaqarApiNetwork - IP_ADDRESS: - get_param: - - NetIpMap - - str_replace: - params: - NETWORK: - get_param: - - ServiceNetMap - - ZaqarApiNetwork - template: NETWORK_uri - port: - get_param: - - EndpointMap - - ZaqarWebSocketInternal - - port - uri_no_suffix: - make_url: - scheme: - get_param: - - EndpointMap - - ZaqarWebSocketInternal - - protocol - host: - str_replace: - template: - get_param: - - EndpointMap - - ZaqarWebSocketInternal - - host - params: - CLOUDNAME: - get_param: - - CloudEndpoints - - get_param: - - ServiceNetMap - - ZaqarApiNetwork - IP_ADDRESS: - get_param: - - NetIpMap - - str_replace: - params: - NETWORK: - get_param: - - ServiceNetMap - - ZaqarApiNetwork - template: NETWORK_uri - port: - get_param: - - EndpointMap - - ZaqarWebSocketInternal - - port - ZaqarWebSocketPublic: - host: - str_replace: - template: - get_param: - - EndpointMap - - ZaqarWebSocketPublic - - 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 - - ZaqarWebSocketPublic - - host - params: - CLOUDNAME: - get_param: - - CloudEndpoints - - get_param: - - ServiceNetMap - - PublicNetwork - IP_ADDRESS: - get_param: - - NetIpMap - - get_param: - - ServiceNetMap - - PublicNetwork - port: - get_param: - - EndpointMap - - ZaqarWebSocketPublic - - port - protocol: - get_param: - - EndpointMap - - ZaqarWebSocketPublic - - protocol - uri: - make_url: - scheme: - get_param: - - EndpointMap - - ZaqarWebSocketPublic - - protocol - host: - str_replace: - template: - get_param: - - EndpointMap - - ZaqarWebSocketPublic - - 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 - - ZaqarWebSocketPublic - - port - uri_no_suffix: - make_url: - scheme: - get_param: - - EndpointMap - - ZaqarWebSocketPublic - - protocol - host: - str_replace: - template: - get_param: - - EndpointMap - - ZaqarWebSocketPublic - - 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 - - ZaqarWebSocketPublic - - port diff --git a/overcloud-resource-registry-puppet.j2.yaml b/overcloud-resource-registry-puppet.j2.yaml index 5bb1dbcf18..562404a907 100644 --- a/overcloud-resource-registry-puppet.j2.yaml +++ b/overcloud-resource-registry-puppet.j2.yaml @@ -272,7 +272,6 @@ resource_registry: OS::TripleO::Services::TripleoPackages: deployment/tripleo-packages/tripleo-packages-baremetal-puppet.yaml OS::TripleO::Services::OpenStackClients: OS::Heat::None OS::TripleO::Services::TLSProxyBase: OS::Heat::None - OS::TripleO::Services::Zaqar: OS::Heat::None OS::TripleO::Services::CinderBackendDellSc: OS::Heat::None OS::TripleO::Services::CinderBackendDellEMCSc: OS::Heat::None OS::TripleO::Services::CinderBackendDellEMCPowerFlex: OS::Heat::None @@ -419,7 +418,6 @@ parameter_defaults: PublicNetwork: {{ _service_nets.get('external', 'ctlplane') }} OpendaylightApiNetwork: {{ _service_nets.get('internal_api', 'ctlplane') }} OvnDbsNetwork: {{ _service_nets.get('internal_api', 'ctlplane') }} - ZaqarApiNetwork: {{ _service_nets.get('internal_api', 'ctlplane') }} DockerRegistryNetwork: ctlplane PacemakerNetwork: {{ _service_nets.get('internal_api', 'ctlplane') }} PacemakerRemoteNetwork: {{ _service_nets.get('internal_api', 'ctlplane') }} @@ -528,9 +526,3 @@ parameter_defaults: SwiftAdmin: {protocol: http, port: '8080', host: IP_ADDRESS} SwiftInternal: {protocol: http, port: '8080', host: IP_ADDRESS} SwiftPublic: {protocol: http, port: '8080', host: IP_ADDRESS} - ZaqarAdmin: {protocol: http, port: '8888', host: IP_ADDRESS} - ZaqarInternal: {protocol: http, port: '8888', host: IP_ADDRESS} - ZaqarPublic: {protocol: http, port: '8888', host: IP_ADDRESS} - ZaqarWebSocketAdmin: {protocol: ws, port: '9000', host: IP_ADDRESS} - ZaqarWebSocketInternal: {protocol: ws, port: '9000', host: IP_ADDRESS} - ZaqarWebSocketPublic: {protocol: ws, port: '9000', host: IP_ADDRESS} diff --git a/releasenotes/notes/zaqar-removal-6cdb31276d5a26dc.yaml b/releasenotes/notes/zaqar-removal-6cdb31276d5a26dc.yaml new file mode 100644 index 0000000000..f860391c24 --- /dev/null +++ b/releasenotes/notes/zaqar-removal-6cdb31276d5a26dc.yaml @@ -0,0 +1,6 @@ +--- +upgrade: + - | + Zaqar has been removed as it was deprecated in Wallaby and is no longer + in use on the undercloud. Additionally it hasn't been supproted in the + overcloud. diff --git a/roles/Controller.yaml b/roles/Controller.yaml index f3bc161763..2418cfcd6b 100644 --- a/roles/Controller.yaml +++ b/roles/Controller.yaml @@ -180,4 +180,3 @@ - OS::TripleO::Services::Tuned - OS::TripleO::Services::Unbound - OS::TripleO::Services::Vpp - - OS::TripleO::Services::Zaqar diff --git a/roles/ControllerAllNovaStandalone.yaml b/roles/ControllerAllNovaStandalone.yaml index be5cbe22f5..18bf5caefc 100644 --- a/roles/ControllerAllNovaStandalone.yaml +++ b/roles/ControllerAllNovaStandalone.yaml @@ -124,4 +124,3 @@ - OS::TripleO::Services::Tuned - OS::TripleO::Services::Unbound - OS::TripleO::Services::Vpp - - OS::TripleO::Services::Zaqar diff --git a/roles/ControllerNoCeph.yaml b/roles/ControllerNoCeph.yaml index f65feaa147..1a1f1a2fb2 100644 --- a/roles/ControllerNoCeph.yaml +++ b/roles/ControllerNoCeph.yaml @@ -168,4 +168,3 @@ - OS::TripleO::Services::Tuned - OS::TripleO::Services::Unbound - OS::TripleO::Services::Vpp - - OS::TripleO::Services::Zaqar diff --git a/roles/ControllerNovaStandalone.yaml b/roles/ControllerNovaStandalone.yaml index 49cd2c4e45..8c815a7663 100644 --- a/roles/ControllerNovaStandalone.yaml +++ b/roles/ControllerNovaStandalone.yaml @@ -144,4 +144,3 @@ - OS::TripleO::Services::TripleoPackages - OS::TripleO::Services::Tuned - OS::TripleO::Services::Vpp - - OS::TripleO::Services::Zaqar diff --git a/roles/ControllerOpenstack.yaml b/roles/ControllerOpenstack.yaml index 1d7ae76803..f07cbec0a4 100644 --- a/roles/ControllerOpenstack.yaml +++ b/roles/ControllerOpenstack.yaml @@ -136,4 +136,3 @@ - OS::TripleO::Services::Tuned - OS::TripleO::Services::Unbound - OS::TripleO::Services::Vpp - - OS::TripleO::Services::Zaqar diff --git a/roles/ControllerSriov.yaml b/roles/ControllerSriov.yaml index e295cdde2e..71c30858b2 100644 --- a/roles/ControllerSriov.yaml +++ b/roles/ControllerSriov.yaml @@ -174,4 +174,3 @@ - OS::TripleO::Services::Tuned - OS::TripleO::Services::Unbound - OS::TripleO::Services::Vpp - - OS::TripleO::Services::Zaqar diff --git a/roles/ControllerStorageDashboard.yaml b/roles/ControllerStorageDashboard.yaml index 05ba429d2d..0aa3bb74f2 100644 --- a/roles/ControllerStorageDashboard.yaml +++ b/roles/ControllerStorageDashboard.yaml @@ -178,4 +178,3 @@ - OS::TripleO::Services::Tuned - OS::TripleO::Services::Unbound - OS::TripleO::Services::Vpp - - OS::TripleO::Services::Zaqar diff --git a/roles/ControllerStorageNfs.yaml b/roles/ControllerStorageNfs.yaml index 49133dfdb7..7ea37b8567 100644 --- a/roles/ControllerStorageNfs.yaml +++ b/roles/ControllerStorageNfs.yaml @@ -179,4 +179,3 @@ - OS::TripleO::Services::Tuned - OS::TripleO::Services::Unbound - OS::TripleO::Services::Vpp - - OS::TripleO::Services::Zaqar diff --git a/roles/Standalone.yaml b/roles/Standalone.yaml index 97a2fa3d12..95a808bb73 100644 --- a/roles/Standalone.yaml +++ b/roles/Standalone.yaml @@ -181,4 +181,3 @@ - OS::TripleO::Services::Unbound - OS::TripleO::Services::Tuned - OS::TripleO::Services::Vpp - - OS::TripleO::Services::Zaqar diff --git a/roles/Undercloud.yaml b/roles/Undercloud.yaml index 37903fb0be..c7b03cf85c 100644 --- a/roles/Undercloud.yaml +++ b/roles/Undercloud.yaml @@ -96,4 +96,3 @@ - OS::TripleO::Services::Tuned - OS::TripleO::Services::UndercloudUpgrade - OS::TripleO::Services::TripleoValidations - - OS::TripleO::Services::Zaqar diff --git a/roles_data.yaml b/roles_data.yaml index 6a06923e34..32dc51a540 100644 --- a/roles_data.yaml +++ b/roles_data.yaml @@ -183,7 +183,6 @@ - OS::TripleO::Services::Tuned - OS::TripleO::Services::Unbound - OS::TripleO::Services::Vpp - - OS::TripleO::Services::Zaqar ############################################################################### # Role: Compute # ############################################################################### diff --git a/roles_data_undercloud.yaml b/roles_data_undercloud.yaml index 14019a759d..3bef98a2ad 100644 --- a/roles_data_undercloud.yaml +++ b/roles_data_undercloud.yaml @@ -99,4 +99,3 @@ - OS::TripleO::Services::Tuned - OS::TripleO::Services::UndercloudUpgrade - OS::TripleO::Services::TripleoValidations - - OS::TripleO::Services::Zaqar diff --git a/sample-env-generator/ssl.yaml b/sample-env-generator/ssl.yaml index f5ce80c247..3df88ad574 100644 --- a/sample-env-generator/ssl.yaml +++ b/sample-env-generator/ssl.yaml @@ -150,8 +150,6 @@ environments: NovaVNCProxyPublic: {protocol: 'https', port: '13080', host: 'IP_ADDRESS'} OctaviaPublic: {protocol: 'https', port: '13876', host: 'IP_ADDRESS'} SwiftPublic: {protocol: 'https', port: '13808', host: 'IP_ADDRESS'} - ZaqarPublic: {protocol: 'https', port: '13888', host: 'IP_ADDRESS'} - ZaqarWebSocketPublic: {protocol: 'wss', port: '3000', host: 'IP_ADDRESS'} - name: ssl/tls-endpoints-public-dns title: Deploy Public SSL Endpoints as DNS Names @@ -197,8 +195,6 @@ environments: NovaVNCProxyPublic: {protocol: 'https', port: '13080', host: 'CLOUDNAME'} OctaviaPublic: {protocol: 'https', port: '13876', host: 'CLOUDNAME'} SwiftPublic: {protocol: 'https', port: '13808', host: 'CLOUDNAME'} - ZaqarPublic: {protocol: 'https', port: '13888', host: 'CLOUDNAME'} - ZaqarWebSocketPublic: {protocol: 'wss', port: '3000', host: 'CLOUDNAME'} - name: ssl/tls-everywhere-endpoints-dns title: Deploy All SSL Endpoints as DNS Names @@ -287,9 +283,3 @@ environments: SwiftAdmin: {protocol: 'https', port: '8080', host: 'CLOUDNAME'} SwiftInternal: {protocol: 'https', port: '8080', host: 'CLOUDNAME'} SwiftPublic: {protocol: 'https', port: '13808', host: 'CLOUDNAME'} - ZaqarAdmin: {protocol: 'https', port: '8888', host: 'CLOUDNAME'} - ZaqarInternal: {protocol: 'https', port: '8888', host: 'CLOUDNAME'} - ZaqarPublic: {protocol: 'https', port: '13888', host: 'CLOUDNAME'} - ZaqarWebSocketAdmin: {protocol: 'wss', port: '9000', host: 'CLOUDNAME'} - ZaqarWebSocketInternal: {protocol: 'wss', port: '9000', host: 'CLOUDNAME'} - ZaqarWebSocketPublic: {protocol: 'wss', port: '3000', host: 'CLOUDNAME'} diff --git a/sample-env-generator/standalone.yaml b/sample-env-generator/standalone.yaml index b94ee4f26f..449642f479 100644 --- a/sample-env-generator/standalone.yaml +++ b/sample-env-generator/standalone.yaml @@ -129,8 +129,6 @@ environments: OS::TripleO::Services::Redis: OS::Heat::None # Rsyslog OS::TripleO::Services::Rsyslog: ../../deployment/logging/rsyslog-baremetal-ansible.yaml - # Zaqar - OS::TripleO::Services::Zaqar: OS::Heat::None - name: standalone/standalone-overcloud @@ -229,8 +227,6 @@ environments: OS::TripleO::Services::ManilaBackendVNX: OS::Heat::None OS::TripleO::Services::ManilaScheduler: OS::Heat::None OS::TripleO::Services::ManilaShare: OS::Heat::None - # Zaqar - OS::TripleO::Services::Zaqar: OS::Heat::None # NOTE(aschultz): So because these are dynamic based on the roles used, we # do not currently define these in any heat files. So we're defining them here diff --git a/sample-env-generator/undercloud-minion.yaml b/sample-env-generator/undercloud-minion.yaml index 69a9f85c9d..3700ccb8e5 100644 --- a/sample-env-generator/undercloud-minion.yaml +++ b/sample-env-generator/undercloud-minion.yaml @@ -268,7 +268,6 @@ environments: OS::TripleO::Services::UndercloudUpgrade: OS::Heat::None OS::TripleO::Services::Vpp: OS::Heat::None OS::TripleO::Services::Xinetd: OS::Heat::None - OS::TripleO::Services::Zaqar: OS::Heat::None # Role specific dynamic parameters, to be defined here # for sample env generator to be happy. parameters: