Remove Tacker service
The Tacker service has been incomplete since Queens. They restructured the services and TripleO has never implemented code to handle this new structure. Since it's been disabled since Queens and there is currently no plans to fix it, let's remove the service code. Change-Id: I2856e894b58d50c2d3484ccd02bfb1d43625847f Depends-On: https://review.opendev.org/#/c/682457/ Related-Bug: #1714270
This commit is contained in:
parent
56cc922ca9
commit
b44a079578
|
@ -22,11 +22,6 @@ resource_registry:
|
||||||
OS::TripleO::Services::OVNController: OS::Heat::None
|
OS::TripleO::Services::OVNController: OS::Heat::None
|
||||||
OS::TripleO::Services::OVNDBs: OS::Heat::None
|
OS::TripleO::Services::OVNDBs: OS::Heat::None
|
||||||
OS::TripleO::Services::OVNMetadataAgent: OS::Heat::None
|
OS::TripleO::Services::OVNMetadataAgent: OS::Heat::None
|
||||||
# TODO(mandre) fix the tacker service - https://bugs.launchpad.net/tripleo/+bug/1714270
|
|
||||||
# OS::TripleO::Services::Tacker: ../../docker/services/tacker.yaml
|
|
||||||
# TODO tacker still wip https://bugs.launchpad.net/tripleo/+bug/1714270
|
|
||||||
# OS::TripleO::Services::Tacker: ../../deployment/tacker/tacker-container-puppet.yaml
|
|
||||||
OS::TripleO::Services::Tacker: OS::Heat::None
|
|
||||||
# environments/docker-ha.yaml enables the cinder service. So disable cinder services
|
# environments/docker-ha.yaml enables the cinder service. So disable cinder services
|
||||||
OS::TripleO::Services::CinderVolume: OS::Heat::None
|
OS::TripleO::Services::CinderVolume: OS::Heat::None
|
||||||
OS::TripleO::Services::CinderApi: OS::Heat::None
|
OS::TripleO::Services::CinderApi: OS::Heat::None
|
||||||
|
@ -76,7 +71,6 @@ parameter_defaults:
|
||||||
- OS::TripleO::Services::Sshd
|
- OS::TripleO::Services::Sshd
|
||||||
- OS::TripleO::Services::Iscsid
|
- OS::TripleO::Services::Iscsid
|
||||||
- OS::TripleO::Services::Multipathd
|
- OS::TripleO::Services::Multipathd
|
||||||
- OS::TripleO::Services::Tacker
|
|
||||||
ControllerExtraConfig:
|
ControllerExtraConfig:
|
||||||
nova::compute::libvirt::services::libvirt_virt_type: qemu
|
nova::compute::libvirt::services::libvirt_virt_type: qemu
|
||||||
nova::compute::libvirt::libvirt_virt_type: qemu
|
nova::compute::libvirt::libvirt_virt_type: qemu
|
||||||
|
|
|
@ -26,11 +26,6 @@ resource_registry:
|
||||||
OS::TripleO::Services::SwiftProxy: OS::Heat::None
|
OS::TripleO::Services::SwiftProxy: OS::Heat::None
|
||||||
OS::TripleO::Services::SwiftStorage: OS::Heat::None
|
OS::TripleO::Services::SwiftStorage: OS::Heat::None
|
||||||
OS::TripleO::Services::SwiftRingBuilder: OS::Heat::None
|
OS::TripleO::Services::SwiftRingBuilder: OS::Heat::None
|
||||||
# TODO(mandre) fix the tacker service - https://bugs.launchpad.net/tripleo/+bug/1714270
|
|
||||||
# OS::TripleO::Services::Tacker: ../../docker/services/tacker.yaml
|
|
||||||
# TODO tacker still wip https://bugs.launchpad.net/tripleo/+bug/1714270
|
|
||||||
# OS::TripleO::Services::Tacker: ../../deployment/tacker/tacker-container-puppet.yaml
|
|
||||||
OS::TripleO::Services::Tacker: OS::Heat::None
|
|
||||||
parameter_defaults:
|
parameter_defaults:
|
||||||
NeutronMechanismDrivers: ['openvswitch']
|
NeutronMechanismDrivers: ['openvswitch']
|
||||||
NeutronTypeDrivers: 'vxlan,vlan,flat,gre'
|
NeutronTypeDrivers: 'vxlan,vlan,flat,gre'
|
||||||
|
|
|
@ -181,7 +181,6 @@
|
||||||
- OS::TripleO::Services::SwiftDispersion
|
- OS::TripleO::Services::SwiftDispersion
|
||||||
- OS::TripleO::Services::SwiftRingBuilder
|
- OS::TripleO::Services::SwiftRingBuilder
|
||||||
- OS::TripleO::Services::SwiftStorage
|
- OS::TripleO::Services::SwiftStorage
|
||||||
- OS::TripleO::Services::Tacker
|
|
||||||
- OS::TripleO::Services::Timesync
|
- OS::TripleO::Services::Timesync
|
||||||
- OS::TripleO::Services::Timezone
|
- OS::TripleO::Services::Timezone
|
||||||
- OS::TripleO::Services::TripleoFirewall
|
- OS::TripleO::Services::TripleoFirewall
|
||||||
|
|
|
@ -1,229 +0,0 @@
|
||||||
heat_template_version: rocky
|
|
||||||
|
|
||||||
description: >
|
|
||||||
OpenStack containerized Tacker service
|
|
||||||
|
|
||||||
parameters:
|
|
||||||
ContainerTackerImage:
|
|
||||||
description: image
|
|
||||||
type: string
|
|
||||||
ContainerTackerConfigImage:
|
|
||||||
description: The container image to use for the tacker 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. 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
|
|
||||||
TackerPassword:
|
|
||||||
description: The password for the tacker service account.
|
|
||||||
type: string
|
|
||||||
hidden: true
|
|
||||||
Debug:
|
|
||||||
type: boolean
|
|
||||||
default: false
|
|
||||||
description: Set to True to enable debugging on all services.
|
|
||||||
TackerDebug:
|
|
||||||
default: ''
|
|
||||||
description: Set to True to enable debugging Tacker service.
|
|
||||||
type: string
|
|
||||||
constraints:
|
|
||||||
- allowed_values: [ '', 'true', 'True', 'TRUE', 'false', 'False', 'FALSE']
|
|
||||||
KeystoneRegion:
|
|
||||||
type: string
|
|
||||||
default: 'regionOne'
|
|
||||||
description: Keystone region for endpoint
|
|
||||||
TackerPolicies:
|
|
||||||
description: |
|
|
||||||
A hash of policies to configure for Tacker.
|
|
||||||
e.g. { tacker-context_is_admin: { key: context_is_admin, value: 'role:admin' } }
|
|
||||||
default: {}
|
|
||||||
type: json
|
|
||||||
NotificationDriver:
|
|
||||||
type: string
|
|
||||||
default: 'messagingv2'
|
|
||||||
description: Driver or drivers to handle sending notifications.
|
|
||||||
|
|
||||||
conditions:
|
|
||||||
service_debug_unset: {equals : [{get_param: TackerDebug}, '']}
|
|
||||||
|
|
||||||
resources:
|
|
||||||
|
|
||||||
ContainersCommon:
|
|
||||||
type: ../containers-common.yaml
|
|
||||||
|
|
||||||
MySQLClient:
|
|
||||||
type: ../database/mysql-client.yaml
|
|
||||||
|
|
||||||
outputs:
|
|
||||||
role_data:
|
|
||||||
description: Role data for the Tacker role.
|
|
||||||
value:
|
|
||||||
service_name: tacker
|
|
||||||
config_settings:
|
|
||||||
tacker_password: {get_param: TackerPassword}
|
|
||||||
tacker::db::database_connection:
|
|
||||||
make_url:
|
|
||||||
scheme: {get_param: [EndpointMap, MysqlInternal, protocol]}
|
|
||||||
username: tacker
|
|
||||||
password: {get_param: TackerPassword}
|
|
||||||
host: {get_param: [EndpointMap, MysqlInternal, host]}
|
|
||||||
path: /tacker
|
|
||||||
query:
|
|
||||||
read_default_file: /etc/my.cnf.d/tripleo.cnf
|
|
||||||
read_default_group: tripleo
|
|
||||||
|
|
||||||
tacker::logging::debug:
|
|
||||||
if:
|
|
||||||
- service_debug_unset
|
|
||||||
- {get_param: Debug }
|
|
||||||
- {get_param: TackerDebug }
|
|
||||||
tacker::notification_driver: {get_param: NotificationDriver}
|
|
||||||
tacker::server::bind_host:
|
|
||||||
str_replace:
|
|
||||||
template:
|
|
||||||
"%{hiera('$NETWORK')}"
|
|
||||||
params:
|
|
||||||
$NETWORK: {get_param: [ServiceNetMap, TackerApiNetwork]}
|
|
||||||
tacker::keystone::authtoken::project_name: 'service'
|
|
||||||
tacker::keystone::authtoken::user_domain_name: 'Default'
|
|
||||||
tacker::keystone::authtoken::project_domain_name: 'Default'
|
|
||||||
tacker::keystone::authtoken::password: {get_param: TackerPassword}
|
|
||||||
tacker::keystone::authtoken::auth_url: {get_param: [EndpointMap, KeystoneInternal, uri_no_suffix]}
|
|
||||||
tacker::keystone::authtoken::www_authenticate_uri: {get_param: [EndpointMap, KeystoneInternal, uri_no_suffix]}
|
|
||||||
tacker::keystone::authtoken::auth_uri: {get_param: [EndpointMap, KeystoneInternal, uri_no_suffix]}
|
|
||||||
|
|
||||||
tacker::db::mysql::password: {get_param: TackerPassword}
|
|
||||||
tacker::db::mysql::user: tacker
|
|
||||||
tacker::db::mysql::host: {get_param: [EndpointMap, MysqlInternal, host_nobrackets]}
|
|
||||||
tacker::db::mysql::dbname: tacker
|
|
||||||
tacker::db::mysql::allowed_hosts:
|
|
||||||
- '%'
|
|
||||||
- {get_param: [EndpointMap, MysqlInternal, host_nobrackets]}
|
|
||||||
tacker::policy::policies: {get_param: TackerPolicies}
|
|
||||||
tripleo::tacker::firewall_rules:
|
|
||||||
'113 tacker':
|
|
||||||
dport:
|
|
||||||
- 9890
|
|
||||||
- 13989
|
|
||||||
service_config_settings:
|
|
||||||
keystone:
|
|
||||||
tacker::keystone::auth::tenant: 'service'
|
|
||||||
tacker::keystone::auth::region: {get_param: KeystoneRegion}
|
|
||||||
tacker::keystone::auth::password: {get_param: TackerPassword}
|
|
||||||
tacker::keystone::auth::public_url: {get_param: [EndpointMap, TackerPublic, uri]}
|
|
||||||
tacker::keystone::auth::internal_url: {get_param: [EndpointMap, TackerInternal, uri]}
|
|
||||||
tacker::keystone::auth::admin_url: {get_param: [EndpointMap, TackerAdmin, uri]}
|
|
||||||
# BEGIN DOCKER SETTINGS
|
|
||||||
puppet_config:
|
|
||||||
config_volume: tacker
|
|
||||||
puppet_tags: tacker_config
|
|
||||||
step_config:
|
|
||||||
list_join:
|
|
||||||
- "\n"
|
|
||||||
- - "include ::tripleo::profile::base::tacker"
|
|
||||||
- {get_attr: [MySQLClient, role_data, step_config]}
|
|
||||||
config_image: {get_param: ContainerTackerConfigImage}
|
|
||||||
kolla_config:
|
|
||||||
/var/lib/kolla/config_files/tacker_api.json:
|
|
||||||
command: /usr/bin/tacker-server --config-file=/etc/tacker/tacker.conf --log-file=/var/log/tacker/api.log
|
|
||||||
config_files:
|
|
||||||
- source: "/var/lib/kolla/config_files/src/*"
|
|
||||||
dest: "/"
|
|
||||||
merge: true
|
|
||||||
preserve_properties: true
|
|
||||||
permissions:
|
|
||||||
- path: /var/log/tacker
|
|
||||||
owner: tacker:tacker
|
|
||||||
recurse: true
|
|
||||||
docker_config:
|
|
||||||
# db sync runs before permissions set by kolla_config
|
|
||||||
step_2:
|
|
||||||
tacker_init_logs:
|
|
||||||
image: &tacker_image {get_param: ContainerTackerImage}
|
|
||||||
net: none
|
|
||||||
privileged: false
|
|
||||||
user: root
|
|
||||||
volumes:
|
|
||||||
- /var/log/containers/tacker:/var/log/tacker
|
|
||||||
command: ['/bin/bash', '-c', 'chown -R tacker:tacker /var/log/tacker']
|
|
||||||
step_3:
|
|
||||||
tacker_db_sync:
|
|
||||||
image: *tacker_image
|
|
||||||
net: host
|
|
||||||
privileged: false
|
|
||||||
detach: false
|
|
||||||
user: root
|
|
||||||
volumes:
|
|
||||||
list_concat:
|
|
||||||
- {get_attr: [ContainersCommon, volumes]}
|
|
||||||
-
|
|
||||||
# FIXME(mandre) mounting /etc rw to workaround LP1696283
|
|
||||||
# This should go away anyway and mount the exact files it
|
|
||||||
# needs or use kolla set_configs.py
|
|
||||||
- /var/lib/config-data/tacker/etc/:/etc/
|
|
||||||
- /var/log/containers/tacker:/var/log/tacker
|
|
||||||
command: "/usr/bin/bootstrap_host_exec tacker su tacker -s /bin/bash -c 'tacker-db-manage --config-file /etc/tacker/tacker.conf upgrade head'"
|
|
||||||
step_4:
|
|
||||||
tacker_api:
|
|
||||||
image: *tacker_image
|
|
||||||
net: host
|
|
||||||
privileged: false
|
|
||||||
restart: always
|
|
||||||
healthcheck:
|
|
||||||
test: /openstack/healthcheck
|
|
||||||
volumes:
|
|
||||||
list_concat:
|
|
||||||
- {get_attr: [ContainersCommon, volumes]}
|
|
||||||
-
|
|
||||||
- /var/lib/kolla/config_files/tacker_api.json:/var/lib/kolla/config_files/config.json:ro
|
|
||||||
- /var/lib/config-data/puppet-generated/tacker/:/var/lib/kolla/config_files/src:ro
|
|
||||||
- /var/log/containers/tacker:/var/log/tacker
|
|
||||||
environment:
|
|
||||||
- KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
|
|
||||||
host_prep_tasks:
|
|
||||||
- name: create persistent directories
|
|
||||||
file:
|
|
||||||
path: "{{ item.path }}"
|
|
||||||
state: directory
|
|
||||||
setype: "{{ item.setype }}"
|
|
||||||
with_items:
|
|
||||||
- { 'path': /var/log/tacker, 'setype': svirt_sandbox_file_t }
|
|
||||||
- { 'path': /var/log/containers/tacker, 'setype': svirt_sandbox_file_t }
|
|
||||||
- name: tacker logs readme
|
|
||||||
copy:
|
|
||||||
dest: /var/log/tacker/readme.txt
|
|
||||||
content: |
|
|
||||||
Log files from tacker containers can be found under
|
|
||||||
/var/log/containers/tacker.
|
|
||||||
ignore_errors: true
|
|
||||||
upgrade_tasks: []
|
|
||||||
post_upgrade_tasks:
|
|
||||||
- when: step|int == 1
|
|
||||||
import_role:
|
|
||||||
name: tripleo-docker-rm
|
|
||||||
vars:
|
|
||||||
containers_to_rm:
|
|
||||||
- tacker_api
|
|
||||||
tripleo_container_cli: "docker"
|
|
|
@ -1,2 +0,0 @@
|
||||||
resource_registry:
|
|
||||||
OS::TripleO::Services::Tacker: ../deployment/tacker/tacker-container-puppet.yaml
|
|
|
@ -1,2 +0,0 @@
|
||||||
resource_registry:
|
|
||||||
OS::TripleO::Services::Tacker: ../../deployment/tacker/tacker-container-puppet.yaml
|
|
|
@ -1,2 +0,0 @@
|
||||||
resource_registry:
|
|
||||||
OS::TripleO::Services::Tacker: ../../deployment/tacker/tacker-container-puppet.yaml
|
|
|
@ -97,9 +97,6 @@ parameter_defaults:
|
||||||
SwiftInternal: {protocol: http, port: '8080', host: IP_ADDRESS}
|
SwiftInternal: {protocol: http, port: '8080', host: IP_ADDRESS}
|
||||||
SwiftPublic: {protocol: http, port: '8080', host: IP_ADDRESS}
|
SwiftPublic: {protocol: http, port: '8080', host: IP_ADDRESS}
|
||||||
SwiftUIConfig: {protocol: http, port: '3000', host: IP_ADDRESS}
|
SwiftUIConfig: {protocol: http, port: '3000', host: IP_ADDRESS}
|
||||||
TackerAdmin: {protocol: http, port: '9890', host: IP_ADDRESS}
|
|
||||||
TackerInternal: {protocol: http, port: '9890', host: IP_ADDRESS}
|
|
||||||
TackerPublic: {protocol: http, port: '9890', host: IP_ADDRESS}
|
|
||||||
ZaqarAdmin: {protocol: http, port: '8888', host: IP_ADDRESS}
|
ZaqarAdmin: {protocol: http, port: '8888', host: IP_ADDRESS}
|
||||||
ZaqarInternal: {protocol: http, port: '8888', host: IP_ADDRESS}
|
ZaqarInternal: {protocol: http, port: '8888', host: IP_ADDRESS}
|
||||||
ZaqarPublic: {protocol: http, port: '8888', host: IP_ADDRESS}
|
ZaqarPublic: {protocol: http, port: '8888', host: IP_ADDRESS}
|
||||||
|
|
|
@ -93,9 +93,6 @@ parameter_defaults:
|
||||||
SwiftInternal: {protocol: 'http', port: '8080', host: 'IP_ADDRESS'}
|
SwiftInternal: {protocol: 'http', port: '8080', host: 'IP_ADDRESS'}
|
||||||
SwiftPublic: {protocol: 'https', port: '13808', host: 'CLOUDNAME'}
|
SwiftPublic: {protocol: 'https', port: '13808', host: 'CLOUDNAME'}
|
||||||
SwiftUIConfig: {protocol: 'https', port: '443', host: 'IP_ADDRESS'}
|
SwiftUIConfig: {protocol: 'https', port: '443', host: 'IP_ADDRESS'}
|
||||||
TackerAdmin: {protocol: 'http', port: '9890', host: 'IP_ADDRESS'}
|
|
||||||
TackerInternal: {protocol: 'http', port: '9890', host: 'IP_ADDRESS'}
|
|
||||||
TackerPublic: {protocol: 'https', port: '13989', host: 'CLOUDNAME'}
|
|
||||||
ZaqarAdmin: {protocol: 'http', port: '8888', host: 'IP_ADDRESS'}
|
ZaqarAdmin: {protocol: 'http', port: '8888', host: 'IP_ADDRESS'}
|
||||||
ZaqarInternal: {protocol: 'http', port: '8888', host: 'IP_ADDRESS'}
|
ZaqarInternal: {protocol: 'http', port: '8888', host: 'IP_ADDRESS'}
|
||||||
ZaqarPublic: {protocol: 'https', port: '13888', host: 'CLOUDNAME'}
|
ZaqarPublic: {protocol: 'https', port: '13888', host: 'CLOUDNAME'}
|
||||||
|
|
|
@ -93,9 +93,6 @@ parameter_defaults:
|
||||||
SwiftInternal: {protocol: 'http', port: '8080', host: 'IP_ADDRESS'}
|
SwiftInternal: {protocol: 'http', port: '8080', host: 'IP_ADDRESS'}
|
||||||
SwiftPublic: {protocol: 'https', port: '13808', host: 'IP_ADDRESS'}
|
SwiftPublic: {protocol: 'https', port: '13808', host: 'IP_ADDRESS'}
|
||||||
SwiftUIConfig: {protocol: 'https', port: '443', host: 'IP_ADDRESS'}
|
SwiftUIConfig: {protocol: 'https', port: '443', host: 'IP_ADDRESS'}
|
||||||
TackerAdmin: {protocol: 'http', port: '9890', host: 'IP_ADDRESS'}
|
|
||||||
TackerInternal: {protocol: 'http', port: '9890', host: 'IP_ADDRESS'}
|
|
||||||
TackerPublic: {protocol: 'https', port: '13989', host: 'IP_ADDRESS'}
|
|
||||||
ZaqarAdmin: {protocol: 'http', port: '8888', host: 'IP_ADDRESS'}
|
ZaqarAdmin: {protocol: 'http', port: '8888', host: 'IP_ADDRESS'}
|
||||||
ZaqarInternal: {protocol: 'http', port: '8888', host: 'IP_ADDRESS'}
|
ZaqarInternal: {protocol: 'http', port: '8888', host: 'IP_ADDRESS'}
|
||||||
ZaqarPublic: {protocol: 'https', port: '13888', host: 'IP_ADDRESS'}
|
ZaqarPublic: {protocol: 'https', port: '13888', host: 'IP_ADDRESS'}
|
||||||
|
|
|
@ -93,9 +93,6 @@ parameter_defaults:
|
||||||
SwiftInternal: {protocol: 'https', port: '8080', host: 'CLOUDNAME'}
|
SwiftInternal: {protocol: 'https', port: '8080', host: 'CLOUDNAME'}
|
||||||
SwiftPublic: {protocol: 'https', port: '13808', host: 'CLOUDNAME'}
|
SwiftPublic: {protocol: 'https', port: '13808', host: 'CLOUDNAME'}
|
||||||
SwiftUIConfig: {protocol: 'https', port: '443', host: 'CLOUDNAME'}
|
SwiftUIConfig: {protocol: 'https', port: '443', host: 'CLOUDNAME'}
|
||||||
TackerAdmin: {protocol: 'https', port: '9890', host: 'CLOUDNAME'}
|
|
||||||
TackerInternal: {protocol: 'https', port: '9890', host: 'CLOUDNAME'}
|
|
||||||
TackerPublic: {protocol: 'https', port: '13989', host: 'CLOUDNAME'}
|
|
||||||
ZaqarAdmin: {protocol: 'https', port: '8888', host: 'CLOUDNAME'}
|
ZaqarAdmin: {protocol: 'https', port: '8888', host: 'CLOUDNAME'}
|
||||||
ZaqarInternal: {protocol: 'https', port: '8888', host: 'CLOUDNAME'}
|
ZaqarInternal: {protocol: 'https', port: '8888', host: 'CLOUDNAME'}
|
||||||
ZaqarPublic: {protocol: 'https', port: '13888', host: 'CLOUDNAME'}
|
ZaqarPublic: {protocol: 'https', port: '13888', host: 'CLOUDNAME'}
|
||||||
|
|
|
@ -81,8 +81,6 @@ resource_registry:
|
||||||
# Sahara
|
# Sahara
|
||||||
OS::TripleO::Services::SaharaApi: OS::Heat::None
|
OS::TripleO::Services::SaharaApi: OS::Heat::None
|
||||||
OS::TripleO::Services::SaharaEngine: OS::Heat::None
|
OS::TripleO::Services::SaharaEngine: OS::Heat::None
|
||||||
# Tacker
|
|
||||||
OS::TripleO::Services::Tacker: OS::Heat::None
|
|
||||||
# Zaqar
|
# Zaqar
|
||||||
OS::TripleO::Services::Zaqar: OS::Heat::None
|
OS::TripleO::Services::Zaqar: OS::Heat::None
|
||||||
|
|
||||||
|
|
|
@ -95,6 +95,5 @@ resource_registry:
|
||||||
OS::TripleO::Services::OpenStackClients: ../../deployment/clients/openstack-clients-baremetal-puppet.yaml
|
OS::TripleO::Services::OpenStackClients: ../../deployment/clients/openstack-clients-baremetal-puppet.yaml
|
||||||
OS::TripleO::Services::SaharaApi: OS::Heat::None
|
OS::TripleO::Services::SaharaApi: OS::Heat::None
|
||||||
OS::TripleO::Services::SaharaEngine: OS::Heat::None
|
OS::TripleO::Services::SaharaEngine: OS::Heat::None
|
||||||
OS::TripleO::Services::Tacker: OS::Heat::None
|
|
||||||
OS::TripleO::Services::Zaqar: OS::Heat::None
|
OS::TripleO::Services::Zaqar: OS::Heat::None
|
||||||
OS::TripleO::Standalone::Net::SoftwareConfig: ../../net-config-bridge.yaml
|
OS::TripleO::Standalone::Net::SoftwareConfig: ../../net-config-bridge.yaml
|
||||||
|
|
|
@ -108,7 +108,6 @@ resource_registry:
|
||||||
OS::TripleO::Services::Redis: OS::Heat::None
|
OS::TripleO::Services::Redis: OS::Heat::None
|
||||||
OS::TripleO::Services::SaharaApi: OS::Heat::None
|
OS::TripleO::Services::SaharaApi: OS::Heat::None
|
||||||
OS::TripleO::Services::SaharaEngine: OS::Heat::None
|
OS::TripleO::Services::SaharaEngine: OS::Heat::None
|
||||||
OS::TripleO::Services::Tacker: OS::Heat::None
|
|
||||||
OS::TripleO::Services::Tmpwatch: ../../deployment/logrotate/tmpwatch-install.yaml
|
OS::TripleO::Services::Tmpwatch: ../../deployment/logrotate/tmpwatch-install.yaml
|
||||||
OS::TripleO::Services::Zaqar: OS::Heat::None
|
OS::TripleO::Services::Zaqar: OS::Heat::None
|
||||||
OS::TripleO::Standalone::Net::SoftwareConfig: ../../net-config-standalone.yaml
|
OS::TripleO::Standalone::Net::SoftwareConfig: ../../net-config-standalone.yaml
|
||||||
|
|
|
@ -230,7 +230,6 @@ resource_registry:
|
||||||
OS::TripleO::Services::SwiftRingBuilder: OS::Heat::None
|
OS::TripleO::Services::SwiftRingBuilder: OS::Heat::None
|
||||||
OS::TripleO::Services::SwiftStorage: OS::Heat::None
|
OS::TripleO::Services::SwiftStorage: OS::Heat::None
|
||||||
OS::TripleO::Services::TLSProxyBase: OS::Heat::None
|
OS::TripleO::Services::TLSProxyBase: OS::Heat::None
|
||||||
OS::TripleO::Services::Tacker: OS::Heat::None
|
|
||||||
OS::TripleO::Services::Tempest: OS::Heat::None
|
OS::TripleO::Services::Tempest: OS::Heat::None
|
||||||
OS::TripleO::Services::Tmpwatch: ../../deployment/logrotate/tmpwatch-install.yaml
|
OS::TripleO::Services::Tmpwatch: ../../deployment/logrotate/tmpwatch-install.yaml
|
||||||
OS::TripleO::Services::TripleoPackages: OS::Heat::None
|
OS::TripleO::Services::TripleoPackages: OS::Heat::None
|
||||||
|
|
|
@ -301,15 +301,6 @@ Sahara:
|
||||||
net_param: SaharaApi
|
net_param: SaharaApi
|
||||||
port: 8386
|
port: 8386
|
||||||
|
|
||||||
Tacker:
|
|
||||||
Internal:
|
|
||||||
net_param: TackerApi
|
|
||||||
Public:
|
|
||||||
net_param: Public
|
|
||||||
Admin:
|
|
||||||
net_param: TackerApi
|
|
||||||
port: 9890
|
|
||||||
|
|
||||||
Ironic:
|
Ironic:
|
||||||
Internal:
|
Internal:
|
||||||
net_param: IronicApi
|
net_param: IronicApi
|
||||||
|
|
|
@ -343,18 +343,6 @@ parameters:
|
||||||
protocol: http
|
protocol: http
|
||||||
port: '3000'
|
port: '3000'
|
||||||
host: IP_ADDRESS
|
host: IP_ADDRESS
|
||||||
TackerAdmin:
|
|
||||||
protocol: http
|
|
||||||
port: '9890'
|
|
||||||
host: IP_ADDRESS
|
|
||||||
TackerInternal:
|
|
||||||
protocol: http
|
|
||||||
port: '9890'
|
|
||||||
host: IP_ADDRESS
|
|
||||||
TackerPublic:
|
|
||||||
protocol: http
|
|
||||||
port: '9890'
|
|
||||||
host: IP_ADDRESS
|
|
||||||
ZaqarAdmin:
|
ZaqarAdmin:
|
||||||
protocol: http
|
protocol: http
|
||||||
port: '8888'
|
port: '8888'
|
||||||
|
@ -12715,387 +12703,6 @@ outputs:
|
||||||
- EndpointMap
|
- EndpointMap
|
||||||
- SwiftUIConfig
|
- SwiftUIConfig
|
||||||
- port
|
- port
|
||||||
TackerAdmin:
|
|
||||||
host:
|
|
||||||
str_replace:
|
|
||||||
template:
|
|
||||||
get_param:
|
|
||||||
- EndpointMap
|
|
||||||
- TackerAdmin
|
|
||||||
- host
|
|
||||||
params:
|
|
||||||
CLOUDNAME:
|
|
||||||
get_param:
|
|
||||||
- CloudEndpoints
|
|
||||||
- get_param:
|
|
||||||
- ServiceNetMap
|
|
||||||
- TackerApiNetwork
|
|
||||||
IP_ADDRESS:
|
|
||||||
get_param:
|
|
||||||
- NetIpMap
|
|
||||||
- str_replace:
|
|
||||||
params:
|
|
||||||
NETWORK:
|
|
||||||
get_param:
|
|
||||||
- ServiceNetMap
|
|
||||||
- TackerApiNetwork
|
|
||||||
template: NETWORK_uri
|
|
||||||
host_nobrackets:
|
|
||||||
str_replace:
|
|
||||||
template:
|
|
||||||
get_param:
|
|
||||||
- EndpointMap
|
|
||||||
- TackerAdmin
|
|
||||||
- host
|
|
||||||
params:
|
|
||||||
CLOUDNAME:
|
|
||||||
get_param:
|
|
||||||
- CloudEndpoints
|
|
||||||
- get_param:
|
|
||||||
- ServiceNetMap
|
|
||||||
- TackerApiNetwork
|
|
||||||
IP_ADDRESS:
|
|
||||||
get_param:
|
|
||||||
- NetIpMap
|
|
||||||
- get_param:
|
|
||||||
- ServiceNetMap
|
|
||||||
- TackerApiNetwork
|
|
||||||
port:
|
|
||||||
get_param:
|
|
||||||
- EndpointMap
|
|
||||||
- TackerAdmin
|
|
||||||
- port
|
|
||||||
protocol:
|
|
||||||
get_param:
|
|
||||||
- EndpointMap
|
|
||||||
- TackerAdmin
|
|
||||||
- protocol
|
|
||||||
uri:
|
|
||||||
make_url:
|
|
||||||
scheme:
|
|
||||||
get_param:
|
|
||||||
- EndpointMap
|
|
||||||
- TackerAdmin
|
|
||||||
- protocol
|
|
||||||
host:
|
|
||||||
str_replace:
|
|
||||||
template:
|
|
||||||
get_param:
|
|
||||||
- EndpointMap
|
|
||||||
- TackerAdmin
|
|
||||||
- host
|
|
||||||
params:
|
|
||||||
CLOUDNAME:
|
|
||||||
get_param:
|
|
||||||
- CloudEndpoints
|
|
||||||
- get_param:
|
|
||||||
- ServiceNetMap
|
|
||||||
- TackerApiNetwork
|
|
||||||
IP_ADDRESS:
|
|
||||||
get_param:
|
|
||||||
- NetIpMap
|
|
||||||
- str_replace:
|
|
||||||
params:
|
|
||||||
NETWORK:
|
|
||||||
get_param:
|
|
||||||
- ServiceNetMap
|
|
||||||
- TackerApiNetwork
|
|
||||||
template: NETWORK_uri
|
|
||||||
port:
|
|
||||||
get_param:
|
|
||||||
- EndpointMap
|
|
||||||
- TackerAdmin
|
|
||||||
- port
|
|
||||||
uri_no_suffix:
|
|
||||||
make_url:
|
|
||||||
scheme:
|
|
||||||
get_param:
|
|
||||||
- EndpointMap
|
|
||||||
- TackerAdmin
|
|
||||||
- protocol
|
|
||||||
host:
|
|
||||||
str_replace:
|
|
||||||
template:
|
|
||||||
get_param:
|
|
||||||
- EndpointMap
|
|
||||||
- TackerAdmin
|
|
||||||
- host
|
|
||||||
params:
|
|
||||||
CLOUDNAME:
|
|
||||||
get_param:
|
|
||||||
- CloudEndpoints
|
|
||||||
- get_param:
|
|
||||||
- ServiceNetMap
|
|
||||||
- TackerApiNetwork
|
|
||||||
IP_ADDRESS:
|
|
||||||
get_param:
|
|
||||||
- NetIpMap
|
|
||||||
- str_replace:
|
|
||||||
params:
|
|
||||||
NETWORK:
|
|
||||||
get_param:
|
|
||||||
- ServiceNetMap
|
|
||||||
- TackerApiNetwork
|
|
||||||
template: NETWORK_uri
|
|
||||||
port:
|
|
||||||
get_param:
|
|
||||||
- EndpointMap
|
|
||||||
- TackerAdmin
|
|
||||||
- port
|
|
||||||
TackerInternal:
|
|
||||||
host:
|
|
||||||
str_replace:
|
|
||||||
template:
|
|
||||||
get_param:
|
|
||||||
- EndpointMap
|
|
||||||
- TackerInternal
|
|
||||||
- host
|
|
||||||
params:
|
|
||||||
CLOUDNAME:
|
|
||||||
get_param:
|
|
||||||
- CloudEndpoints
|
|
||||||
- get_param:
|
|
||||||
- ServiceNetMap
|
|
||||||
- TackerApiNetwork
|
|
||||||
IP_ADDRESS:
|
|
||||||
get_param:
|
|
||||||
- NetIpMap
|
|
||||||
- str_replace:
|
|
||||||
params:
|
|
||||||
NETWORK:
|
|
||||||
get_param:
|
|
||||||
- ServiceNetMap
|
|
||||||
- TackerApiNetwork
|
|
||||||
template: NETWORK_uri
|
|
||||||
host_nobrackets:
|
|
||||||
str_replace:
|
|
||||||
template:
|
|
||||||
get_param:
|
|
||||||
- EndpointMap
|
|
||||||
- TackerInternal
|
|
||||||
- host
|
|
||||||
params:
|
|
||||||
CLOUDNAME:
|
|
||||||
get_param:
|
|
||||||
- CloudEndpoints
|
|
||||||
- get_param:
|
|
||||||
- ServiceNetMap
|
|
||||||
- TackerApiNetwork
|
|
||||||
IP_ADDRESS:
|
|
||||||
get_param:
|
|
||||||
- NetIpMap
|
|
||||||
- get_param:
|
|
||||||
- ServiceNetMap
|
|
||||||
- TackerApiNetwork
|
|
||||||
port:
|
|
||||||
get_param:
|
|
||||||
- EndpointMap
|
|
||||||
- TackerInternal
|
|
||||||
- port
|
|
||||||
protocol:
|
|
||||||
get_param:
|
|
||||||
- EndpointMap
|
|
||||||
- TackerInternal
|
|
||||||
- protocol
|
|
||||||
uri:
|
|
||||||
make_url:
|
|
||||||
scheme:
|
|
||||||
get_param:
|
|
||||||
- EndpointMap
|
|
||||||
- TackerInternal
|
|
||||||
- protocol
|
|
||||||
host:
|
|
||||||
str_replace:
|
|
||||||
template:
|
|
||||||
get_param:
|
|
||||||
- EndpointMap
|
|
||||||
- TackerInternal
|
|
||||||
- host
|
|
||||||
params:
|
|
||||||
CLOUDNAME:
|
|
||||||
get_param:
|
|
||||||
- CloudEndpoints
|
|
||||||
- get_param:
|
|
||||||
- ServiceNetMap
|
|
||||||
- TackerApiNetwork
|
|
||||||
IP_ADDRESS:
|
|
||||||
get_param:
|
|
||||||
- NetIpMap
|
|
||||||
- str_replace:
|
|
||||||
params:
|
|
||||||
NETWORK:
|
|
||||||
get_param:
|
|
||||||
- ServiceNetMap
|
|
||||||
- TackerApiNetwork
|
|
||||||
template: NETWORK_uri
|
|
||||||
port:
|
|
||||||
get_param:
|
|
||||||
- EndpointMap
|
|
||||||
- TackerInternal
|
|
||||||
- port
|
|
||||||
uri_no_suffix:
|
|
||||||
make_url:
|
|
||||||
scheme:
|
|
||||||
get_param:
|
|
||||||
- EndpointMap
|
|
||||||
- TackerInternal
|
|
||||||
- protocol
|
|
||||||
host:
|
|
||||||
str_replace:
|
|
||||||
template:
|
|
||||||
get_param:
|
|
||||||
- EndpointMap
|
|
||||||
- TackerInternal
|
|
||||||
- host
|
|
||||||
params:
|
|
||||||
CLOUDNAME:
|
|
||||||
get_param:
|
|
||||||
- CloudEndpoints
|
|
||||||
- get_param:
|
|
||||||
- ServiceNetMap
|
|
||||||
- TackerApiNetwork
|
|
||||||
IP_ADDRESS:
|
|
||||||
get_param:
|
|
||||||
- NetIpMap
|
|
||||||
- str_replace:
|
|
||||||
params:
|
|
||||||
NETWORK:
|
|
||||||
get_param:
|
|
||||||
- ServiceNetMap
|
|
||||||
- TackerApiNetwork
|
|
||||||
template: NETWORK_uri
|
|
||||||
port:
|
|
||||||
get_param:
|
|
||||||
- EndpointMap
|
|
||||||
- TackerInternal
|
|
||||||
- port
|
|
||||||
TackerPublic:
|
|
||||||
host:
|
|
||||||
str_replace:
|
|
||||||
template:
|
|
||||||
get_param:
|
|
||||||
- EndpointMap
|
|
||||||
- TackerPublic
|
|
||||||
- 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
|
|
||||||
- TackerPublic
|
|
||||||
- host
|
|
||||||
params:
|
|
||||||
CLOUDNAME:
|
|
||||||
get_param:
|
|
||||||
- CloudEndpoints
|
|
||||||
- get_param:
|
|
||||||
- ServiceNetMap
|
|
||||||
- PublicNetwork
|
|
||||||
IP_ADDRESS:
|
|
||||||
get_param:
|
|
||||||
- NetIpMap
|
|
||||||
- get_param:
|
|
||||||
- ServiceNetMap
|
|
||||||
- PublicNetwork
|
|
||||||
port:
|
|
||||||
get_param:
|
|
||||||
- EndpointMap
|
|
||||||
- TackerPublic
|
|
||||||
- port
|
|
||||||
protocol:
|
|
||||||
get_param:
|
|
||||||
- EndpointMap
|
|
||||||
- TackerPublic
|
|
||||||
- protocol
|
|
||||||
uri:
|
|
||||||
make_url:
|
|
||||||
scheme:
|
|
||||||
get_param:
|
|
||||||
- EndpointMap
|
|
||||||
- TackerPublic
|
|
||||||
- protocol
|
|
||||||
host:
|
|
||||||
str_replace:
|
|
||||||
template:
|
|
||||||
get_param:
|
|
||||||
- EndpointMap
|
|
||||||
- TackerPublic
|
|
||||||
- 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
|
|
||||||
- TackerPublic
|
|
||||||
- port
|
|
||||||
uri_no_suffix:
|
|
||||||
make_url:
|
|
||||||
scheme:
|
|
||||||
get_param:
|
|
||||||
- EndpointMap
|
|
||||||
- TackerPublic
|
|
||||||
- protocol
|
|
||||||
host:
|
|
||||||
str_replace:
|
|
||||||
template:
|
|
||||||
get_param:
|
|
||||||
- EndpointMap
|
|
||||||
- TackerPublic
|
|
||||||
- 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
|
|
||||||
- TackerPublic
|
|
||||||
- port
|
|
||||||
ZaqarAdmin:
|
ZaqarAdmin:
|
||||||
host:
|
host:
|
||||||
str_replace:
|
str_replace:
|
||||||
|
|
|
@ -62,7 +62,6 @@ parameters:
|
||||||
NovajoinNetwork: {{ _service_nets.get('internal_api', 'ctlplane') }}
|
NovajoinNetwork: {{ _service_nets.get('internal_api', 'ctlplane') }}
|
||||||
Ec2ApiNetwork: {{ _service_nets.get('internal_api', 'ctlplane') }}
|
Ec2ApiNetwork: {{ _service_nets.get('internal_api', 'ctlplane') }}
|
||||||
Ec2ApiMetadataNetwork: {{ _service_nets.get('internal_api', 'ctlplane') }}
|
Ec2ApiMetadataNetwork: {{ _service_nets.get('internal_api', 'ctlplane') }}
|
||||||
TackerApiNetwork: {{ _service_nets.get('internal_api', 'ctlplane') }}
|
|
||||||
SwiftStorageNetwork: {{ _service_nets.get('storage_mgmt', 'ctlplane') }}
|
SwiftStorageNetwork: {{ _service_nets.get('storage_mgmt', 'ctlplane') }}
|
||||||
SwiftProxyNetwork: {{ _service_nets.get('storage', 'ctlplane') }}
|
SwiftProxyNetwork: {{ _service_nets.get('storage', 'ctlplane') }}
|
||||||
SaharaApiNetwork: {{ _service_nets.get('internal_api', 'ctlplane') }}
|
SaharaApiNetwork: {{ _service_nets.get('internal_api', 'ctlplane') }}
|
||||||
|
|
|
@ -214,7 +214,6 @@ resource_registry:
|
||||||
OS::TripleO::Services::SwiftStorage: deployment/swift/swift-storage-container-puppet.yaml
|
OS::TripleO::Services::SwiftStorage: deployment/swift/swift-storage-container-puppet.yaml
|
||||||
OS::TripleO::Services::SwiftRingBuilder: deployment/swift/swift-ringbuilder-container-puppet.yaml
|
OS::TripleO::Services::SwiftRingBuilder: deployment/swift/swift-ringbuilder-container-puppet.yaml
|
||||||
OS::TripleO::Services::Snmp: deployment/snmp/snmp-baremetal-puppet.yaml
|
OS::TripleO::Services::Snmp: deployment/snmp/snmp-baremetal-puppet.yaml
|
||||||
OS::TripleO::Services::Tacker: OS::Heat::None
|
|
||||||
OS::TripleO::Services::Timezone: deployment/time/timezone-baremetal-ansible.yaml
|
OS::TripleO::Services::Timezone: deployment/time/timezone-baremetal-ansible.yaml
|
||||||
OS::TripleO::Services::CeilometerAgentCentral: deployment/ceilometer/ceilometer-agent-central-container-puppet.yaml
|
OS::TripleO::Services::CeilometerAgentCentral: deployment/ceilometer/ceilometer-agent-central-container-puppet.yaml
|
||||||
OS::TripleO::Services::CeilometerAgentIpmi: deployment/ceilometer/ceilometer-agent-ipmi-container-puppet.yaml
|
OS::TripleO::Services::CeilometerAgentIpmi: deployment/ceilometer/ceilometer-agent-ipmi-container-puppet.yaml
|
||||||
|
|
|
@ -0,0 +1,5 @@
|
||||||
|
---
|
||||||
|
other:
|
||||||
|
- |
|
||||||
|
Removed Tacker service definitions. The Tacker containers have not been
|
||||||
|
available since Queens. `bug 1838704 <https://bugs.launchpad.net/tripleo/+bug/1714270>`
|
|
@ -177,7 +177,6 @@
|
||||||
- OS::TripleO::Services::SwiftDispersion
|
- OS::TripleO::Services::SwiftDispersion
|
||||||
- OS::TripleO::Services::SwiftRingBuilder
|
- OS::TripleO::Services::SwiftRingBuilder
|
||||||
- OS::TripleO::Services::SwiftStorage
|
- OS::TripleO::Services::SwiftStorage
|
||||||
- OS::TripleO::Services::Tacker
|
|
||||||
- OS::TripleO::Services::Timesync
|
- OS::TripleO::Services::Timesync
|
||||||
- OS::TripleO::Services::Timezone
|
- OS::TripleO::Services::Timezone
|
||||||
- OS::TripleO::Services::TripleoFirewall
|
- OS::TripleO::Services::TripleoFirewall
|
||||||
|
|
|
@ -127,7 +127,6 @@
|
||||||
- OS::TripleO::Services::SwiftDispersion
|
- OS::TripleO::Services::SwiftDispersion
|
||||||
- OS::TripleO::Services::SwiftRingBuilder
|
- OS::TripleO::Services::SwiftRingBuilder
|
||||||
- OS::TripleO::Services::SwiftStorage
|
- OS::TripleO::Services::SwiftStorage
|
||||||
- OS::TripleO::Services::Tacker
|
|
||||||
- OS::TripleO::Services::Timesync
|
- OS::TripleO::Services::Timesync
|
||||||
- OS::TripleO::Services::Timezone
|
- OS::TripleO::Services::Timezone
|
||||||
- OS::TripleO::Services::TripleoFirewall
|
- OS::TripleO::Services::TripleoFirewall
|
||||||
|
|
|
@ -169,7 +169,6 @@
|
||||||
- OS::TripleO::Services::SwiftDispersion
|
- OS::TripleO::Services::SwiftDispersion
|
||||||
- OS::TripleO::Services::SwiftRingBuilder
|
- OS::TripleO::Services::SwiftRingBuilder
|
||||||
- OS::TripleO::Services::SwiftStorage
|
- OS::TripleO::Services::SwiftStorage
|
||||||
- OS::TripleO::Services::Tacker
|
|
||||||
- OS::TripleO::Services::Timesync
|
- OS::TripleO::Services::Timesync
|
||||||
- OS::TripleO::Services::Timezone
|
- OS::TripleO::Services::Timezone
|
||||||
- OS::TripleO::Services::TripleoFirewall
|
- OS::TripleO::Services::TripleoFirewall
|
||||||
|
|
|
@ -145,7 +145,6 @@
|
||||||
- OS::TripleO::Services::SwiftDispersion
|
- OS::TripleO::Services::SwiftDispersion
|
||||||
- OS::TripleO::Services::SwiftRingBuilder
|
- OS::TripleO::Services::SwiftRingBuilder
|
||||||
- OS::TripleO::Services::SwiftStorage
|
- OS::TripleO::Services::SwiftStorage
|
||||||
- OS::TripleO::Services::Tacker
|
|
||||||
- OS::TripleO::Services::Timesync
|
- OS::TripleO::Services::Timesync
|
||||||
- OS::TripleO::Services::Timezone
|
- OS::TripleO::Services::Timezone
|
||||||
- OS::TripleO::Services::TripleoFirewall
|
- OS::TripleO::Services::TripleoFirewall
|
||||||
|
|
|
@ -141,7 +141,6 @@
|
||||||
- OS::TripleO::Services::SwiftDispersion
|
- OS::TripleO::Services::SwiftDispersion
|
||||||
- OS::TripleO::Services::SwiftRingBuilder
|
- OS::TripleO::Services::SwiftRingBuilder
|
||||||
- OS::TripleO::Services::SwiftStorage
|
- OS::TripleO::Services::SwiftStorage
|
||||||
- OS::TripleO::Services::Tacker
|
|
||||||
- OS::TripleO::Services::Timesync
|
- OS::TripleO::Services::Timesync
|
||||||
- OS::TripleO::Services::Timezone
|
- OS::TripleO::Services::Timezone
|
||||||
- OS::TripleO::Services::TripleoFirewall
|
- OS::TripleO::Services::TripleoFirewall
|
||||||
|
|
|
@ -179,7 +179,6 @@
|
||||||
- OS::TripleO::Services::SwiftDispersion
|
- OS::TripleO::Services::SwiftDispersion
|
||||||
- OS::TripleO::Services::SwiftRingBuilder
|
- OS::TripleO::Services::SwiftRingBuilder
|
||||||
- OS::TripleO::Services::SwiftStorage
|
- OS::TripleO::Services::SwiftStorage
|
||||||
- OS::TripleO::Services::Tacker
|
|
||||||
- OS::TripleO::Services::Timesync
|
- OS::TripleO::Services::Timesync
|
||||||
- OS::TripleO::Services::Timezone
|
- OS::TripleO::Services::Timezone
|
||||||
- OS::TripleO::Services::TripleoFirewall
|
- OS::TripleO::Services::TripleoFirewall
|
||||||
|
|
|
@ -178,7 +178,6 @@
|
||||||
- OS::TripleO::Services::SwiftDispersion
|
- OS::TripleO::Services::SwiftDispersion
|
||||||
- OS::TripleO::Services::SwiftRingBuilder
|
- OS::TripleO::Services::SwiftRingBuilder
|
||||||
- OS::TripleO::Services::SwiftStorage
|
- OS::TripleO::Services::SwiftStorage
|
||||||
- OS::TripleO::Services::Tacker
|
|
||||||
- OS::TripleO::Services::Timesync
|
- OS::TripleO::Services::Timesync
|
||||||
- OS::TripleO::Services::Timezone
|
- OS::TripleO::Services::Timezone
|
||||||
- OS::TripleO::Services::TripleoFirewall
|
- OS::TripleO::Services::TripleoFirewall
|
||||||
|
|
|
@ -177,7 +177,6 @@
|
||||||
- OS::TripleO::Services::SwiftProxy
|
- OS::TripleO::Services::SwiftProxy
|
||||||
- OS::TripleO::Services::SwiftRingBuilder
|
- OS::TripleO::Services::SwiftRingBuilder
|
||||||
- OS::TripleO::Services::SwiftStorage
|
- OS::TripleO::Services::SwiftStorage
|
||||||
- OS::TripleO::Services::Tacker
|
|
||||||
- OS::TripleO::Services::Timesync
|
- OS::TripleO::Services::Timesync
|
||||||
- OS::TripleO::Services::Timezone
|
- OS::TripleO::Services::Timezone
|
||||||
- OS::TripleO::Services::Tmpwatch
|
- OS::TripleO::Services::Tmpwatch
|
||||||
|
|
|
@ -180,7 +180,6 @@
|
||||||
- OS::TripleO::Services::SwiftDispersion
|
- OS::TripleO::Services::SwiftDispersion
|
||||||
- OS::TripleO::Services::SwiftRingBuilder
|
- OS::TripleO::Services::SwiftRingBuilder
|
||||||
- OS::TripleO::Services::SwiftStorage
|
- OS::TripleO::Services::SwiftStorage
|
||||||
- OS::TripleO::Services::Tacker
|
|
||||||
- OS::TripleO::Services::Timesync
|
- OS::TripleO::Services::Timesync
|
||||||
- OS::TripleO::Services::Timezone
|
- OS::TripleO::Services::Timezone
|
||||||
- OS::TripleO::Services::TripleoFirewall
|
- OS::TripleO::Services::TripleoFirewall
|
||||||
|
|
|
@ -201,9 +201,6 @@ environments:
|
||||||
SwiftInternal: {protocol: 'http', port: '8080', host: 'IP_ADDRESS'}
|
SwiftInternal: {protocol: 'http', port: '8080', host: 'IP_ADDRESS'}
|
||||||
SwiftPublic: {protocol: 'https', port: '13808', host: 'IP_ADDRESS'}
|
SwiftPublic: {protocol: 'https', port: '13808', host: 'IP_ADDRESS'}
|
||||||
SwiftUIConfig: {protocol: 'https', port: '443', host: 'IP_ADDRESS'}
|
SwiftUIConfig: {protocol: 'https', port: '443', host: 'IP_ADDRESS'}
|
||||||
TackerAdmin: {protocol: 'http', port: '9890', host: 'IP_ADDRESS'}
|
|
||||||
TackerInternal: {protocol: 'http', port: '9890', host: 'IP_ADDRESS'}
|
|
||||||
TackerPublic: {protocol: 'https', port: '13989', host: 'IP_ADDRESS'}
|
|
||||||
ZaqarAdmin: {protocol: 'http', port: '8888', host: 'IP_ADDRESS'}
|
ZaqarAdmin: {protocol: 'http', port: '8888', host: 'IP_ADDRESS'}
|
||||||
ZaqarInternal: {protocol: 'http', port: '8888', host: 'IP_ADDRESS'}
|
ZaqarInternal: {protocol: 'http', port: '8888', host: 'IP_ADDRESS'}
|
||||||
ZaqarPublic: {protocol: 'https', port: '13888', host: 'IP_ADDRESS'}
|
ZaqarPublic: {protocol: 'https', port: '13888', host: 'IP_ADDRESS'}
|
||||||
|
@ -310,9 +307,6 @@ environments:
|
||||||
SwiftInternal: {protocol: 'http', port: '8080', host: 'IP_ADDRESS'}
|
SwiftInternal: {protocol: 'http', port: '8080', host: 'IP_ADDRESS'}
|
||||||
SwiftPublic: {protocol: 'https', port: '13808', host: 'CLOUDNAME'}
|
SwiftPublic: {protocol: 'https', port: '13808', host: 'CLOUDNAME'}
|
||||||
SwiftUIConfig: {protocol: 'https', port: '443', host: 'IP_ADDRESS'}
|
SwiftUIConfig: {protocol: 'https', port: '443', host: 'IP_ADDRESS'}
|
||||||
TackerAdmin: {protocol: 'http', port: '9890', host: 'IP_ADDRESS'}
|
|
||||||
TackerInternal: {protocol: 'http', port: '9890', host: 'IP_ADDRESS'}
|
|
||||||
TackerPublic: {protocol: 'https', port: '13989', host: 'CLOUDNAME'}
|
|
||||||
ZaqarAdmin: {protocol: 'http', port: '8888', host: 'IP_ADDRESS'}
|
ZaqarAdmin: {protocol: 'http', port: '8888', host: 'IP_ADDRESS'}
|
||||||
ZaqarInternal: {protocol: 'http', port: '8888', host: 'IP_ADDRESS'}
|
ZaqarInternal: {protocol: 'http', port: '8888', host: 'IP_ADDRESS'}
|
||||||
ZaqarPublic: {protocol: 'https', port: '13888', host: 'CLOUDNAME'}
|
ZaqarPublic: {protocol: 'https', port: '13888', host: 'CLOUDNAME'}
|
||||||
|
@ -419,9 +413,6 @@ environments:
|
||||||
SwiftInternal: {protocol: 'https', port: '8080', host: 'CLOUDNAME'}
|
SwiftInternal: {protocol: 'https', port: '8080', host: 'CLOUDNAME'}
|
||||||
SwiftPublic: {protocol: 'https', port: '13808', host: 'CLOUDNAME'}
|
SwiftPublic: {protocol: 'https', port: '13808', host: 'CLOUDNAME'}
|
||||||
SwiftUIConfig: {protocol: 'https', port: '443', host: 'CLOUDNAME'}
|
SwiftUIConfig: {protocol: 'https', port: '443', host: 'CLOUDNAME'}
|
||||||
TackerAdmin: {protocol: 'https', port: '9890', host: 'CLOUDNAME'}
|
|
||||||
TackerInternal: {protocol: 'https', port: '9890', host: 'CLOUDNAME'}
|
|
||||||
TackerPublic: {protocol: 'https', port: '13989', host: 'CLOUDNAME'}
|
|
||||||
ZaqarAdmin: {protocol: 'https', port: '8888', host: 'CLOUDNAME'}
|
ZaqarAdmin: {protocol: 'https', port: '8888', host: 'CLOUDNAME'}
|
||||||
ZaqarInternal: {protocol: 'https', port: '8888', host: 'CLOUDNAME'}
|
ZaqarInternal: {protocol: 'https', port: '8888', host: 'CLOUDNAME'}
|
||||||
ZaqarPublic: {protocol: 'https', port: '13888', host: 'CLOUDNAME'}
|
ZaqarPublic: {protocol: 'https', port: '13888', host: 'CLOUDNAME'}
|
||||||
|
@ -538,9 +529,6 @@ environments:
|
||||||
SwiftInternal: {protocol: http, port: '8080', host: IP_ADDRESS}
|
SwiftInternal: {protocol: http, port: '8080', host: IP_ADDRESS}
|
||||||
SwiftPublic: {protocol: http, port: '8080', host: IP_ADDRESS}
|
SwiftPublic: {protocol: http, port: '8080', host: IP_ADDRESS}
|
||||||
SwiftUIConfig: {protocol: http, port: '3000', host: IP_ADDRESS}
|
SwiftUIConfig: {protocol: http, port: '3000', host: IP_ADDRESS}
|
||||||
TackerAdmin: {protocol: http, port: '9890', host: IP_ADDRESS}
|
|
||||||
TackerInternal: {protocol: http, port: '9890', host: IP_ADDRESS}
|
|
||||||
TackerPublic: {protocol: http, port: '9890', host: IP_ADDRESS}
|
|
||||||
ZaqarAdmin: {protocol: http, port: '8888', host: IP_ADDRESS}
|
ZaqarAdmin: {protocol: http, port: '8888', host: IP_ADDRESS}
|
||||||
ZaqarInternal: {protocol: http, port: '8888', host: IP_ADDRESS}
|
ZaqarInternal: {protocol: http, port: '8888', host: IP_ADDRESS}
|
||||||
ZaqarPublic: {protocol: http, port: '8888', host: IP_ADDRESS}
|
ZaqarPublic: {protocol: http, port: '8888', host: IP_ADDRESS}
|
||||||
|
|
|
@ -134,8 +134,6 @@ environments:
|
||||||
# Sahara
|
# Sahara
|
||||||
OS::TripleO::Services::SaharaApi: OS::Heat::None
|
OS::TripleO::Services::SaharaApi: OS::Heat::None
|
||||||
OS::TripleO::Services::SaharaEngine: OS::Heat::None
|
OS::TripleO::Services::SaharaEngine: OS::Heat::None
|
||||||
# Tacker
|
|
||||||
OS::TripleO::Services::Tacker: OS::Heat::None
|
|
||||||
# Zaqar
|
# Zaqar
|
||||||
OS::TripleO::Services::Zaqar: OS::Heat::None
|
OS::TripleO::Services::Zaqar: OS::Heat::None
|
||||||
|
|
||||||
|
@ -244,8 +242,6 @@ environments:
|
||||||
# Sahara
|
# Sahara
|
||||||
OS::TripleO::Services::SaharaApi: OS::Heat::None
|
OS::TripleO::Services::SaharaApi: OS::Heat::None
|
||||||
OS::TripleO::Services::SaharaEngine: OS::Heat::None
|
OS::TripleO::Services::SaharaEngine: OS::Heat::None
|
||||||
# Tacker
|
|
||||||
OS::TripleO::Services::Tacker: OS::Heat::None
|
|
||||||
# Zaqar
|
# Zaqar
|
||||||
OS::TripleO::Services::Zaqar: OS::Heat::None
|
OS::TripleO::Services::Zaqar: OS::Heat::None
|
||||||
|
|
||||||
|
|
|
@ -251,7 +251,6 @@ environments:
|
||||||
OS::TripleO::Services::SwiftProxy: OS::Heat::None
|
OS::TripleO::Services::SwiftProxy: OS::Heat::None
|
||||||
OS::TripleO::Services::SwiftRingBuilder: OS::Heat::None
|
OS::TripleO::Services::SwiftRingBuilder: OS::Heat::None
|
||||||
OS::TripleO::Services::SwiftStorage: OS::Heat::None
|
OS::TripleO::Services::SwiftStorage: OS::Heat::None
|
||||||
OS::TripleO::Services::Tacker: OS::Heat::None
|
|
||||||
OS::TripleO::Services::Tempest: OS::Heat::None
|
OS::TripleO::Services::Tempest: OS::Heat::None
|
||||||
OS::TripleO::Services::TLSProxyBase: OS::Heat::None
|
OS::TripleO::Services::TLSProxyBase: OS::Heat::None
|
||||||
OS::TripleO::Services::TripleoPackages: OS::Heat::None
|
OS::TripleO::Services::TripleoPackages: OS::Heat::None
|
||||||
|
|
Loading…
Reference in New Issue