diff --git a/ci/environments/scenario004-multinode-containers.yaml b/ci/environments/scenario004-multinode-containers.yaml index 92fff64f3f..d38b5afa49 100644 --- a/ci/environments/scenario004-multinode-containers.yaml +++ b/ci/environments/scenario004-multinode-containers.yaml @@ -10,9 +10,9 @@ resource_registry: OS::TripleO::Services::SwiftProxy: OS::Heat::None OS::TripleO::Services::SwiftStorage: OS::Heat::None OS::TripleO::Services::SwiftRingBuilder: OS::Heat::None - OS::TripleO::Services::ManilaApi: ../../docker/services/manila-api.yaml - OS::TripleO::Services::ManilaScheduler: ../../docker/services/manila-scheduler.yaml - OS::TripleO::Services::ManilaShare: ../../docker/services/pacemaker/manila-share.yaml + OS::TripleO::Services::ManilaApi: ../../deployment/manila/manila-api-container-puppet.yaml + OS::TripleO::Services::ManilaScheduler: ../../deployment/manila/manila-scheduler-container-puppet.yaml + OS::TripleO::Services::ManilaShare: ../../deployment/manila/manila-share-pacemaker-puppet.yaml OS::TripleO::Services::ManilaBackendCephFs: ../../puppet/services/manila-backend-cephfs.yaml # TODO: in Queens, re-add bgp-vpn and l2gw services when # containerized. diff --git a/ci/environments/scenario004-standalone.yaml b/ci/environments/scenario004-standalone.yaml index 26745ebde4..8abab45324 100644 --- a/ci/environments/scenario004-standalone.yaml +++ b/ci/environments/scenario004-standalone.yaml @@ -13,9 +13,9 @@ resource_registry: OS::TripleO::Services::SwiftProxy: OS::Heat::None OS::TripleO::Services::SwiftStorage: OS::Heat::None OS::TripleO::Services::SwiftRingBuilder: OS::Heat::None - OS::TripleO::Services::ManilaApi: ../../docker/services/manila-api.yaml - OS::TripleO::Services::ManilaScheduler: ../../docker/services/manila-scheduler.yaml - OS::TripleO::Services::ManilaShare: ../../docker/services/pacemaker/manila-share.yaml + OS::TripleO::Services::ManilaApi: ../../deployment/manila/manila-api-container-puppet.yaml + OS::TripleO::Services::ManilaScheduler: ../../deployment/manila/manila-scheduler-container-puppet.yaml + OS::TripleO::Services::ManilaShare: ../../deployment/manila/manila-share-pacemaker-puppet.yaml OS::TripleO::Services::ManilaBackendCephFs: ../../puppet/services/manila-backend-cephfs.yaml OS::TripleO::Services::OsloMessagingRpc: ../../docker/services/pacemaker/rpc-rabbitmq.yaml OS::TripleO::Services::OsloMessagingNotify: ../../docker/services/messaging/notify-rabbitmq-shared.yaml diff --git a/docker/services/manila-api.yaml b/deployment/manila/manila-api-container-puppet.yaml similarity index 68% rename from docker/services/manila-api.yaml rename to deployment/manila/manila-api-container-puppet.yaml index 12ac02267d..c35b467c00 100644 --- a/docker/services/manila-api.yaml +++ b/deployment/manila/manila-api-container-puppet.yaml @@ -36,17 +36,28 @@ parameters: default: {} description: Parameters specific to the role type: json + ManilaPassword: + description: The password for the manila service account. + type: string + hidden: true + KeystoneRegion: + type: string + default: 'regionOne' + description: Keystone region for endpoint + MonitoringSubscriptionManilaApi: + default: 'overcloud-manila-api' + type: string resources: ContainersCommon: - type: ./containers-common.yaml + type: ../../docker/services/containers-common.yaml MySQLClient: type: ../../deployment/database/mysql-client.yaml - ManilaApiPuppetBase: - type: ../../puppet/services/manila-api.yaml + ManilaBase: + type: ./manila-base.yaml properties: EndpointMap: {get_param: EndpointMap} ServiceData: {get_param: ServiceData} @@ -57,9 +68,48 @@ outputs: role_data: description: Role data for the Manila API role. value: - service_name: {get_attr: [ManilaApiPuppetBase, role_data, service_name]} - config_settings: {get_attr: [ManilaApiPuppetBase, role_data, config_settings]} - service_config_settings: {get_attr: [ManilaApiPuppetBase, role_data, service_config_settings]} + service_name: manila_api + config_settings: + map_merge: + - get_attr: [ManilaBase, role_data, config_settings] + - manila::keystone::authtoken::password: {get_param: ManilaPassword} + manila::keystone::authtoken::auth_uri: { get_param: [EndpointMap, KeystoneInternal, uri_no_suffix] } + manila::keystone::authtoken::auth_url: { get_param: [EndpointMap, KeystoneInternal, uri_no_suffix] } + manila::keystone::authtoken::project_name: 'service' + manila::keystone::authtoken::user_domain_name: 'Default' + manila::keystone::authtoken::project_domain_name: 'Default' + tripleo::manila_api::firewall_rules: + '150 manila': + dport: + - 8786 + - 13786 + # 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 + manila::api::bind_host: + str_replace: + template: + "%{hiera('$NETWORK')}" + params: + $NETWORK: {get_param: [ServiceNetMap, ManilaApiNetwork]} + manila::api::enable_proxy_headers_parsing: true + manila::api::default_share_type: 'default' + service_config_settings: + map_merge: + - get_attr: [ManilaBase, role_data, service_config_settings] + - keystone: + manila::keystone::auth::tenant: 'service' + manila::keystone::auth::public_url: {get_param: [EndpointMap, ManilaV1Public, uri]} + manila::keystone::auth::internal_url: {get_param: [EndpointMap, ManilaV1Internal, uri]} + manila::keystone::auth::admin_url: {get_param: [EndpointMap, ManilaV1Admin, uri]} + manila::keystone::auth::public_url_v2: {get_param: [EndpointMap, ManilaPublic, uri]} + manila::keystone::auth::internal_url_v2: {get_param: [EndpointMap, ManilaInternal, uri]} + manila::keystone::auth::admin_url_v2: {get_param: [EndpointMap, ManilaAdmin, uri]} + manila::keystone::auth::password: {get_param: ManilaPassword} + manila::keystone::auth::region: {get_param: KeystoneRegion} # BEGIN DOCKER SETTINGS # puppet_config: config_volume: manila @@ -67,7 +117,7 @@ outputs: step_config: list_join: - "\n" - - - {get_attr: [ManilaApiPuppetBase, role_data, step_config]} + - - "include ::tripleo::profile::base::manila::api" - {get_attr: [MySQLClient, role_data, step_config]} config_image: {get_param: DockerManilaConfigImage} kolla_config: diff --git a/puppet/services/manila-base.yaml b/deployment/manila/manila-base.yaml similarity index 100% rename from puppet/services/manila-base.yaml rename to deployment/manila/manila-base.yaml diff --git a/docker/services/manila-scheduler.yaml b/deployment/manila/manila-scheduler-container-puppet.yaml similarity index 78% rename from docker/services/manila-scheduler.yaml rename to deployment/manila/manila-scheduler-container-puppet.yaml index 68b4f713e0..4bd7677076 100644 --- a/docker/services/manila-scheduler.yaml +++ b/deployment/manila/manila-scheduler-container-puppet.yaml @@ -36,17 +36,32 @@ parameters: default: {} description: Parameters specific to the role type: json + MonitoringSubscriptionManilaScheduler: + default: 'overcloud-manila-scheduler' + type: string + RpcPort: + default: 5672 + description: The network port for messaging backend + type: number + NeutronPassword: + description: The password for the neutron service and db account, used by neutron agents. + type: string + hidden: true + NovaPassword: + description: The password for the nova service and db account + type: string + hidden: true resources: ContainersCommon: - type: ./containers-common.yaml + type: ../../docker/services/containers-common.yaml MySQLClient: type: ../../deployment/database/mysql-client.yaml - ManilaSchedulerPuppetBase: - type: ../../puppet/services/manila-scheduler.yaml + ManilaBase: + type: ./manila-base.yaml properties: EndpointMap: {get_param: EndpointMap} ServiceData: {get_param: ServiceData} @@ -57,9 +72,17 @@ outputs: role_data: description: Role data for the Manila Scheduler role. value: - service_name: {get_attr: [ManilaSchedulerPuppetBase, role_data, service_name]} - config_settings: {get_attr: [ManilaSchedulerPuppetBase, role_data, config_settings]} - service_config_settings: {get_attr: [ManilaSchedulerPuppetBase, role_data, service_config_settings]} + service_name: manila_scheduler + monitoring_subscription: {get_param: MonitoringSubscriptionManilaScheduler} + config_settings: + map_merge: + - get_attr: [ManilaBase, role_data, config_settings] + - manila::compute::nova::auth_url: {get_param: [EndpointMap, KeystoneInternal, uri]} + manila::compute::nova::password: {get_param: NovaPassword} + manila::compute::nova::project_name: 'service' + manila::network::neutron::auth_url: {get_param: [EndpointMap, KeystoneInternal, uri]} + manila::network::neutron::password: {get_param: NeutronPassword} + service_config_settings: {get_attr: [ManilaBase, role_data, service_config_settings]} # BEGIN DOCKER SETTINGS # puppet_config: config_volume: manila @@ -67,7 +90,7 @@ outputs: step_config: list_join: - "\n" - - - {get_attr: [ManilaSchedulerPuppetBase, role_data, step_config]} + - - "include ::tripleo::profile::base::manila::scheduler" - {get_attr: [MySQLClient, role_data, step_config]} config_image: {get_param: DockerManilaConfigImage} kolla_config: @@ -96,7 +119,7 @@ outputs: - yaql: expression: str($.data.port) data: - port: {get_attr: [ManilaSchedulerPuppetBase, role_data, config_settings, 'manila::rabbit_port']} + port: {get_param: RpcPort} volumes: list_concat: - {get_attr: [ContainersCommon, volumes]} diff --git a/docker/services/manila-common.yaml b/deployment/manila/manila-share-common.yaml similarity index 97% rename from docker/services/manila-common.yaml rename to deployment/manila/manila-share-common.yaml index 41e5d3b01f..3955b93655 100644 --- a/docker/services/manila-common.yaml +++ b/deployment/manila/manila-share-common.yaml @@ -46,7 +46,7 @@ conditions: resources: ContainersCommon: - type: ./containers-common.yaml + type: ../../docker/services/containers-common.yaml outputs: manila_share_volumes: diff --git a/docker/services/manila-share.yaml b/deployment/manila/manila-share-container-puppet.yaml similarity index 78% rename from docker/services/manila-share.yaml rename to deployment/manila/manila-share-container-puppet.yaml index 6ddd121cc7..efe121fa05 100644 --- a/docker/services/manila-share.yaml +++ b/deployment/manila/manila-share-container-puppet.yaml @@ -48,17 +48,24 @@ parameters: description: > The Ceph cluster name must be at least 1 character and contain only letters and numbers. + MonitoringSubscriptionManilaShare: + default: 'overcloud-manila-share' + type: string + ManilaPassword: + description: The password for the manila service account. + type: string + hidden: true resources: ContainersCommon: - type: ./containers-common.yaml + type: ../../docker/services/containers-common.yaml MySQLClient: type: ../../deployment/database/mysql-client.yaml ManilaBase: - type: ../../puppet/services/manila-share.yaml + type: ./manila-base.yaml properties: EndpointMap: {get_param: EndpointMap} ServiceData: {get_param: ServiceData} @@ -67,16 +74,26 @@ resources: RoleName: {get_param: RoleName} RoleParameters: {get_param: RoleParameters} - ManilaCommon: - type: ./manila-common.yaml + ManilaShareCommon: + type: ./manila-share-common.yaml outputs: role_data: description: Role data for the Manila Share role. value: - service_name: {get_attr: [ManilaBase, role_data, service_name]} - config_settings: {get_attr: [ManilaBase, role_data, config_settings]} - service_config_settings: {get_attr: [ManilaBase, role_data, service_config_settings]} + service_name: manila_share + monitoring_subscription: {get_param: MonitoringSubscriptionManilaShare} + config_settings: + map_merge: + - get_attr: [ManilaBase, role_data, config_settings] + - manila::volume::cinder::cinder_admin_tenant_name: 'service' + manila::keystone::authtoken::password: {get_param: ManilaPassword} + manila::keystone::authtoken::www_authenticate_uri: {get_param: [EndpointMap, KeystoneInternal, uri]} + manila::keystone::authtoken::auth_uri: {get_param: [EndpointMap, KeystoneInternal, uri]} + manila::keystone::authtoken::auth_url: { get_param: [EndpointMap, KeystoneInternal, uri_no_suffix] } + manila::keystone::authtoken::project_name: 'service' + service_config_settings: + {get_attr: [ManilaBase, role_data, service_config_settings]} # BEGIN DOCKER SETTINGS puppet_config: config_volume: manila @@ -84,7 +101,7 @@ outputs: step_config: list_join: - "\n" - - - {get_attr: [ManilaBase, role_data, step_config]} + - - "include ::tripleo::profile::base::manila::share" - {get_attr: [MySQLClient, role_data, step_config]} config_image: {get_param: DockerManilaConfigImage} kolla_config: @@ -117,8 +134,8 @@ outputs: image: &manila_share_image {get_param: DockerManilaShareImage} net: host restart: always - volumes: {get_attr: [ManilaCommon, manila_share_volumes]} - environment: {get_attr: [ManilaCommon, manila_share_environment]} + volumes: {get_attr: [ManilaShareCommon, manila_share_volumes]} + environment: {get_attr: [ManilaShareCommon, manila_share_environment]} host_prep_tasks: - name: create persistent directories file: diff --git a/docker/services/pacemaker/manila-share.yaml b/deployment/manila/manila-share-pacemaker-puppet.yaml similarity index 97% rename from docker/services/pacemaker/manila-share.yaml rename to deployment/manila/manila-share-pacemaker-puppet.yaml index fd89fe6332..3e8e5708d6 100644 --- a/docker/services/pacemaker/manila-share.yaml +++ b/deployment/manila/manila-share-pacemaker-puppet.yaml @@ -64,13 +64,13 @@ conditions: resources: ContainersCommon: - type: ../containers-common.yaml + type: ../../docker/services/containers-common.yaml MySQLClient: - type: ../../../deployment/database/mysql-client.yaml + type: ../database/mysql-client.yaml - ManilaBase: - type: ../../../puppet/services/pacemaker/manila-share.yaml + ManilaShareContainerBase: + type: ./manila-share-container-puppet.yaml properties: EndpointMap: {get_param: EndpointMap} ServiceData: {get_param: ServiceData} @@ -80,16 +80,16 @@ resources: RoleParameters: {get_param: RoleParameters} ManilaCommon: - type: ../manila-common.yaml + type: ./manila-share-common.yaml outputs: role_data: description: Role data for the Manila Share role. value: - service_name: {get_attr: [ManilaBase, role_data, service_name]} + service_name: manila_share config_settings: map_merge: - - get_attr: [ManilaBase, role_data, config_settings] + - get_attr: [ManilaShareContainerBase, role_data, config_settings] - tripleo::profile::pacemaker::manila::share_bundle::manila_share_docker_image: &manila_share_image_pcmklatest list_join: - ':' @@ -103,7 +103,7 @@ outputs: manila::share::manage_service: false manila::share::enabled: false manila::host: hostgroup - service_config_settings: {get_attr: [ManilaBase, role_data, service_config_settings]} + service_config_settings: {get_attr: [ManilaShareContainerBase, role_data, service_config_settings]} # BEGIN DOCKER SETTINGS puppet_config: config_volume: manila @@ -111,7 +111,7 @@ outputs: step_config: list_join: - "\n" - - - {get_attr: [ManilaBase, role_data, step_config]} + - - "include ::tripleo::profile::pacemaker::manila" - {get_attr: [MySQLClient, role_data, step_config]} config_image: {get_param: DockerManilaConfigImage} kolla_config: diff --git a/environments/manila-cephfsganesha-config.yaml b/environments/manila-cephfsganesha-config.yaml index 9a58fe3ba3..8fb250372a 100644 --- a/environments/manila-cephfsganesha-config.yaml +++ b/environments/manila-cephfsganesha-config.yaml @@ -1,10 +1,10 @@ # A Heat environment file which can be used to enable a # a Manila CephFS-NFS driver backend. resource_registry: - OS::TripleO::Services::ManilaApi: ../docker/services/manila-api.yaml - OS::TripleO::Services::ManilaScheduler: ../docker/services/manila-scheduler.yaml + OS::TripleO::Services::ManilaApi: ../deployment/manila/manila-api-container-puppet.yaml + OS::TripleO::Services::ManilaScheduler: ../deployment/manila/manila-scheduler-container-puppet.yaml # Only manila-share is pacemaker managed: - OS::TripleO::Services::ManilaShare: ../docker/services/pacemaker/manila-share.yaml + OS::TripleO::Services::ManilaShare: ../deployment/manila/manila-share-pacemaker-puppet.yaml OS::TripleO::Services::ManilaBackendCephFs: ../puppet/services/manila-backend-cephfs.yaml # ceph-nfs (ganesha) service is installed and configured by ceph-ansible # but it's still managed by pacemaker diff --git a/environments/manila-cephfsnative-config.yaml b/environments/manila-cephfsnative-config.yaml index d85109ec5a..da26b50bdd 100644 --- a/environments/manila-cephfsnative-config.yaml +++ b/environments/manila-cephfsnative-config.yaml @@ -1,10 +1,10 @@ # A Heat environment file which can be used to enable a # a Manila CephFS Native driver backend. resource_registry: - OS::TripleO::Services::ManilaApi: ../docker/services/manila-api.yaml - OS::TripleO::Services::ManilaScheduler: ../docker/services/manila-scheduler.yaml + OS::TripleO::Services::ManilaApi: ../deployment/manila/manila-api-container-puppet.yaml + OS::TripleO::Services::ManilaScheduler: ../deployment/manila/manila-scheduler-container-puppet.yaml # Only manila-share is pacemaker managed: - OS::TripleO::Services::ManilaShare: ../docker/services/pacemaker/manila-share.yaml + OS::TripleO::Services::ManilaShare: ../deployment/manila/manila-share-pacemaker-puppet.yaml OS::TripleO::Services::ManilaBackendCephFs: ../puppet/services/manila-backend-cephfs.yaml diff --git a/environments/manila-isilon-config.yaml b/environments/manila-isilon-config.yaml index 009ddb26d0..4bfcf0a636 100644 --- a/environments/manila-isilon-config.yaml +++ b/environments/manila-isilon-config.yaml @@ -1,9 +1,9 @@ # This environment file enables Manila with the Isilon backend. resource_registry: - OS::TripleO::Services::ManilaApi: ../docker/services/manila-api.yaml - OS::TripleO::Services::ManilaScheduler: ../docker/services/manila-scheduler.yaml + OS::TripleO::Services::ManilaApi: ../deployment/manila/manila-api-container-puppet.yaml + OS::TripleO::Services::ManilaScheduler: ../deployment/manila/manila-scheduler-container-puppet.yaml # Only manila-share is pacemaker managed: - OS::TripleO::Services::ManilaShare: ../docker/services/pacemaker/manila-share.yaml + OS::TripleO::Services::ManilaShare: ../deployment/manila/manila-share-pacemaker-puppet.yaml OS::TripleO::Services::ManilaBackendIsilon: ../puppet/services/manila-backend-isilon.yaml parameter_defaults: diff --git a/environments/manila-netapp-config.yaml b/environments/manila-netapp-config.yaml index a08a759c30..4f46dda5f4 100644 --- a/environments/manila-netapp-config.yaml +++ b/environments/manila-netapp-config.yaml @@ -1,9 +1,9 @@ # This environment file enables Manila with the Netapp backend. resource_registry: - OS::TripleO::Services::ManilaApi: ../docker/services/manila-api.yaml - OS::TripleO::Services::ManilaScheduler: ../docker/services/manila-scheduler.yaml + OS::TripleO::Services::ManilaApi: ../deployment/manila/manila-api-container-puppet.yaml + OS::TripleO::Services::ManilaScheduler: ../deployment/manila/manila-scheduler-container-puppet.yam # Only manila-share is pacemaker managed: - OS::TripleO::Services::ManilaShare: ../docker/services/pacemaker/manila-share.yaml + OS::TripleO::Services::ManilaShare: ../docker/deployment/manila/manila-share-pacemaker-puppet.yaml OS::TripleO::Services::ManilaBackendNetapp: ../puppet/services/manila-backend-netapp.yaml parameter_defaults: diff --git a/environments/manila-unity-config.yaml b/environments/manila-unity-config.yaml index e5f213c911..a8693d78eb 100644 --- a/environments/manila-unity-config.yaml +++ b/environments/manila-unity-config.yaml @@ -1,9 +1,9 @@ # This environment file enables Manila with the Unity backend. resource_registry: - OS::TripleO::Services::ManilaApi: ../docker/services/manila-api.yaml - OS::TripleO::Services::ManilaScheduler: ../docker/services/manila-scheduler.yaml + OS::TripleO::Services::ManilaApi: ../deployment/manila/manila-api-container-puppet.yaml + OS::TripleO::Services::ManilaScheduler: ../deployment/manila/manila-scheduler-container-puppet.yaml # Only manila-share is pacemaker managed: - OS::TripleO::Services::ManilaShare: ../docker/services/pacemaker/manila-share.yaml + OS::TripleO::Services::ManilaShare: ../deployment/manila/manila-share-pacemaker-puppet.yaml OS::TripleO::Services::ManilaBackendUnity: ../puppet/services/manila-backend-unity.yaml parameter_defaults: diff --git a/environments/manila-vmax-config.yaml b/environments/manila-vmax-config.yaml index fba37d114b..3c160241be 100644 --- a/environments/manila-vmax-config.yaml +++ b/environments/manila-vmax-config.yaml @@ -1,9 +1,9 @@ # This environment file enables Manila with the VMAX backend. resource_registry: - OS::TripleO::Services::ManilaApi: ../docker/services/manila-api.yaml - OS::TripleO::Services::ManilaScheduler: ../docker/services/manila-scheduler.yaml + OS::TripleO::Services::ManilaApi: ../deployment/manila/manila-api-container-puppet.yaml + OS::TripleO::Services::ManilaScheduler: ../deployment/manila/manila-scheduler-container-puppet.yaml # Only manila-share is pacemaker managed: - OS::TripleO::Services::ManilaShare: ../docker/services/pacemaker/manila-share.yaml + OS::TripleO::Services::ManilaShare: ../deployment/manila/manila-share-pacemaker-puppet.yaml OS::TripleO::Services::ManilaBackendVMAX: ../puppet/services/manila-backend-vmax.yaml parameter_defaults: diff --git a/environments/manila-vnx-config.yaml b/environments/manila-vnx-config.yaml index d1043581f3..9e68688f80 100644 --- a/environments/manila-vnx-config.yaml +++ b/environments/manila-vnx-config.yaml @@ -1,9 +1,9 @@ # This environment file enables Manila with the VNX backend. resource_registry: - OS::TripleO::Services::ManilaApi: ../docker/services/manila-api.yaml - OS::TripleO::Services::ManilaScheduler: ../docker/services/manila-scheduler.yaml + OS::TripleO::Services::ManilaApi: ../deployment/manila/manila-api-container-puppet.yaml + OS::TripleO::Services::ManilaScheduler: ../deployment/manila/manila-scheduler-container-puppet.yaml # Only manila-share is pacemaker managed: - OS::TripleO::Services::ManilaShare: ../docker/services/pacemaker/manila-share.yaml + OS::TripleO::Services::ManilaShare: ../deployment/manila/manila-share-pacemaker-puppet.yaml OS::TripleO::Services::ManilaBackendVNX: ../puppet/services/manila-backend-vnx.yaml parameter_defaults: diff --git a/environments/services-baremetal/manila.yaml b/environments/services-baremetal/manila.yaml index 0d50225e8e..57af5c39bd 100644 --- a/environments/services-baremetal/manila.yaml +++ b/environments/services-baremetal/manila.yaml @@ -1,4 +1,4 @@ resource_registry: - OS::TripleO::Services::ManilaApi: ../../puppet/services/manila-api.yaml - OS::TripleO::Services::ManilaScheduler: ../../puppet/services/manila-scheduler.yaml - OS::TripleO::Services::ManilaShare: ../../puppet/services/manila-share.yaml + OS::TripleO::Services::ManilaApi: ../../deployment/manila/manila-api-container-puppet.yaml + OS::TripleO::Services::ManilaScheduler: ../../deployment/manila/manila-scheduler-container-puppet.yaml + OS::TripleO::Services::ManilaShare: ../../deployment/manila/manila-share-container-puppet.yaml diff --git a/environments/services/manila.yaml b/environments/services/manila.yaml index eacdb1a1dd..57af5c39bd 100644 --- a/environments/services/manila.yaml +++ b/environments/services/manila.yaml @@ -1,4 +1,4 @@ resource_registry: - OS::TripleO::Services::ManilaApi: ../../docker/services/manila-api.yaml - OS::TripleO::Services::ManilaScheduler: ../../docker/services/manila-scheduler.yaml - OS::TripleO::Services::ManilaShare: ../../docker/services/manila-share.yaml + OS::TripleO::Services::ManilaApi: ../../deployment/manila/manila-api-container-puppet.yaml + OS::TripleO::Services::ManilaScheduler: ../../deployment/manila/manila-scheduler-container-puppet.yaml + OS::TripleO::Services::ManilaShare: ../../deployment/manila/manila-share-container-puppet.yaml diff --git a/puppet/services/manila-api.yaml b/puppet/services/manila-api.yaml deleted file mode 100644 index ec4e6be2b2..0000000000 --- a/puppet/services/manila-api.yaml +++ /dev/null @@ -1,104 +0,0 @@ -heat_template_version: rocky - -description: > - Manila-api service configured with Puppet - -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 - ManilaPassword: - description: The password for the manila service account. - type: string - hidden: true - KeystoneRegion: - type: string - default: 'regionOne' - description: Keystone region for endpoint - MonitoringSubscriptionManilaApi: - default: 'overcloud-manila-api' - type: string - -resources: - ManilaBase: - type: ./manila-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 Manila-api role. - value: - service_name: manila_api - monitoring_subscription: {get_param: MonitoringSubscriptionManilaApi} - config_settings: - map_merge: - - get_attr: [ManilaBase, role_data, config_settings] - - manila::keystone::authtoken::password: {get_param: ManilaPassword} - manila::keystone::authtoken::auth_uri: { get_param: [EndpointMap, KeystoneInternal, uri_no_suffix] } - manila::keystone::authtoken::auth_url: { get_param: [EndpointMap, KeystoneInternal, uri_no_suffix] } - manila::keystone::authtoken::project_name: 'service' - manila::keystone::authtoken::user_domain_name: 'Default' - manila::keystone::authtoken::project_domain_name: 'Default' - tripleo::manila_api::firewall_rules: - '150 manila': - dport: - - 8786 - - 13786 - # 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 - manila::api::bind_host: - str_replace: - template: - "%{hiera('$NETWORK')}" - params: - $NETWORK: {get_param: [ServiceNetMap, ManilaApiNetwork]} - manila::api::enable_proxy_headers_parsing: true - manila::api::default_share_type: 'default' - step_config: | - include ::tripleo::profile::base::manila::api - service_config_settings: - map_merge: - - get_attr: [ManilaBase, role_data, service_config_settings] - - keystone: - manila::keystone::auth::tenant: 'service' - manila::keystone::auth::public_url: {get_param: [EndpointMap, ManilaV1Public, uri]} - manila::keystone::auth::internal_url: {get_param: [EndpointMap, ManilaV1Internal, uri]} - manila::keystone::auth::admin_url: {get_param: [EndpointMap, ManilaV1Admin, uri]} - manila::keystone::auth::public_url_v2: {get_param: [EndpointMap, ManilaPublic, uri]} - manila::keystone::auth::internal_url_v2: {get_param: [EndpointMap, ManilaInternal, uri]} - manila::keystone::auth::admin_url_v2: {get_param: [EndpointMap, ManilaAdmin, uri]} - manila::keystone::auth::password: {get_param: ManilaPassword} - manila::keystone::auth::region: {get_param: KeystoneRegion} diff --git a/puppet/services/manila-scheduler.yaml b/puppet/services/manila-scheduler.yaml deleted file mode 100644 index ea844b0864..0000000000 --- a/puppet/services/manila-scheduler.yaml +++ /dev/null @@ -1,71 +0,0 @@ -heat_template_version: rocky - -description: > - Manila-scheduler service configured with Puppet - -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 - NovaPassword: - type: string - description: The password for the nova service and db account - hidden: true - NeutronPassword: - description: The password for the neutron service and db account, used by neutron agents. - type: string - hidden: true - MonitoringSubscriptionManilaScheduler: - default: 'overcloud-manila-scheduler' - type: string - -resources: - ManilaBase: - type: ./manila-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 Manila-scheduler role. - value: - service_name: manila_scheduler - monitoring_subscription: {get_param: MonitoringSubscriptionManilaScheduler} - config_settings: - map_merge: - - get_attr: [ManilaBase, role_data, config_settings] - - manila::compute::nova::auth_url: {get_param: [EndpointMap, KeystoneInternal, uri]} - manila::compute::nova::password: {get_param: NovaPassword} - manila::compute::nova::project_name: 'service' - manila::network::neutron::auth_url: {get_param: [EndpointMap, KeystoneInternal, uri]} - manila::network::neutron::password: {get_param: NeutronPassword} - step_config: | - include ::tripleo::profile::base::manila::scheduler diff --git a/puppet/services/manila-share.yaml b/puppet/services/manila-share.yaml deleted file mode 100644 index b3875f335d..0000000000 --- a/puppet/services/manila-share.yaml +++ /dev/null @@ -1,70 +0,0 @@ -heat_template_version: rocky - -description: > - Manila-share service configured with Puppet - -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 - MonitoringSubscriptionManilaShare: - default: 'overcloud-manila-share' - type: string - ManilaPassword: - description: The password for the manila service account. - type: string - hidden: true - -resources: - ManilaBase: - type: ./manila-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 Manila-share role. - value: - service_name: manila_share - monitoring_subscription: {get_param: MonitoringSubscriptionManilaShare} - config_settings: - map_merge: - - get_attr: [ManilaBase, role_data, config_settings] - - manila::volume::cinder::cinder_admin_tenant_name: 'service' - manila::keystone::authtoken::password: {get_param: ManilaPassword} - manila::keystone::authtoken::www_authenticate_uri: {get_param: [EndpointMap, KeystoneInternal, uri]} - manila::keystone::authtoken::auth_uri: {get_param: [EndpointMap, KeystoneInternal, uri]} - manila::keystone::authtoken::auth_url: { get_param: [EndpointMap, KeystoneInternal, uri_no_suffix] } - manila::keystone::authtoken::project_name: 'service' - service_config_settings: - get_attr: [ManilaBase, role_data, service_config_settings] - step_config: | - include ::tripleo::profile::base::manila::share diff --git a/puppet/services/pacemaker/manila-share.yaml b/puppet/services/pacemaker/manila-share.yaml deleted file mode 100644 index 0958466d03..0000000000 --- a/puppet/services/pacemaker/manila-share.yaml +++ /dev/null @@ -1,59 +0,0 @@ -heat_template_version: rocky - -description: > - The manila-share service with Pacemaker configured with Puppet - -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 - -resources: - - ManilaShareBase: - type: ../manila-share.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 manila-share pacemaker role. - value: - service_name: manila_share - monitoring_subscription: {get_attr: [ManilaShareBase, role_data, monitoring_subscription]} - config_settings: - map_merge: - - get_attr: [ManilaShareBase, role_data, config_settings] - - manila::share::manage_service: false - manila::share::enabled: false - manila::host: hostgroup - step_config: | - include ::tripleo::profile::pacemaker::manila