Merge "Enable Manila integration - as a composable controller service"

8 files changed, 294 insertions, 0 deletions

diff --git a/puppet/all-nodes-config.yaml b/puppet/all-nodes-config.yaml
index 803a5d49..4c9355d5 100644
--- a/puppet/all-nodes-config.yaml
+++ b/puppet/all-nodes-config.yaml
@@ -48,6 +48,8 @@ parameters:
     type: comma_delimited_list
   cinder_api_node_ips:
     type: comma_delimited_list
+  manila_api_node_ips:
+    type: comma_delimited_list
   neutron_api_node_ips:
     type: comma_delimited_list
   keystone_public_api_node_ips:
@@ -260,6 +262,14 @@ resources:
                         list_join:
                         - "','"
                         - {get_param: cinder_api_node_ips}
+                manila_api_node_ips:
+                  str_replace:
+                    template: "['SERVERS_LIST']"
+                    params:
+                      SERVERS_LIST:
+                        list_join:
+                        - "','"
+                        - {get_param: manila_api_node_ips}
                 neutron_api_node_ips:
                   str_replace:
                     template: "['SERVERS_LIST']"
@@ -332,6 +342,7 @@ resources:
                 aodh::rabbit_hosts: *rabbit_nodes_array
                 cinder::rabbit_hosts: *rabbit_nodes_array
                 glance::notify::rabbitmq::rabbit_hosts: *rabbit_nodes_array
+                manila::rabbit_hosts: *rabbit_nodes_array
                 heat::rabbit_hosts: *rabbit_nodes_array
                 neutron::rabbit_hosts: *rabbit_nodes_array
                 nova::rabbit_hosts: *rabbit_nodes_array
diff --git a/puppet/controller.yaml b/puppet/controller.yaml
index 679fd90b..b604ffca 100644
--- a/puppet/controller.yaml
+++ b/puppet/controller.yaml
@@ -586,6 +586,7 @@ resources:
         keystone_public_api_network: {get_attr: [NetIpMap, net_ip_map, {get_param: [ServiceNetMap, KeystonePublicApiNetwork]}]}
         keystone_admin_api_network: {get_attr: [NetIpMap, net_ip_map, {get_param: [ServiceNetMap, KeystoneAdminApiNetwork]}]}
         keystone_region: {get_param: KeystoneRegion}
+        manila_api_network: {get_attr: [NetIpMap, net_ip_map, {get_param: [ServiceNetMap, ManilaApiNetwork]}]}
         mongo_db_network: {get_attr: [NetIpMap, net_ip_map, {get_param: [ServiceNetMap, MongoDbNetwork]}]}
         neutron_api_network: {get_attr: [NetIpMap, net_ip_map, {get_param: [ServiceNetMap, NeutronApiNetwork]}]}
         neutron_local_ip: {get_attr: [NetIpMap, net_ip_map, {get_param: [ServiceNetMap, NeutronTenantNetwork]}]}
@@ -723,6 +724,9 @@ resources:
                 keystone::wsgi::apache::bind_host: {get_input: keystone_public_api_network}
                 keystone::wsgi::apache::admin_bind_host: {get_input: keystone_admin_api_network}
 
+                # Manila
+                manila::api::bind_host: {get_input: manila_api_network}
+
                 # MongoDB
                 mongodb::server::bind_ip: {get_input: mongo_db_network}
 
diff --git a/puppet/services/manila-api.yaml b/puppet/services/manila-api.yaml
new file mode 100644
index 00000000..ccae4467
--- /dev/null
+++ b/puppet/services/manila-api.yaml
@@ -0,0 +1,46 @@
+heat_template_version: 2016-04-08
+
+description: >
+  Manila-api service configured with Puppet
+
+parameters:
+  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
+
+resources:
+  ManilaBase:
+    type: ./manila-base.yaml
+    properties:
+      EndpointMap: {get_param: EndpointMap}
+
+outputs:
+  role_data:
+    description: Role data for the Manila-api role.
+    value:
+      service_name: manila_api
+      config_settings:
+        map_merge:
+          - get_attr: [ManilaBase, role_data, config_settings]
+          - manila::api::keystone_password: {get_param: ManilaPassword}
+            manila::api::keystone_auth_uri: {get_param: [EndpointMap, KeystoneInternal, uri]}
+            manila::api::keystone_auth_host: {get_param: [EndpointMap, ManilaInternal, host]}
+            manila::keystone::auth::public_url: {get_param: [EndpointMap, ManilaPublic, uri]}
+            manila::keystone::auth::internal_url: {get_param: [EndpointMap, ManilaInternal, uri]}
+            manila::keystone::auth::admin_url: {get_param: [EndpointMap, ManilaAdmin, uri]}
+            manila::keystone::auth::password: {get_param: ManilaPassword }
+            manila::keystone::auth::region: {get_param: KeystoneRegion }
+            manila::api::keystone_tenant: 'service'
+      step_config: |
+        include ::tripleo::profile::base::manila::api
+
diff --git a/puppet/services/manila-base.yaml b/puppet/services/manila-base.yaml
new file mode 100644
index 00000000..c156379b
--- /dev/null
+++ b/puppet/services/manila-base.yaml
@@ -0,0 +1,119 @@
+heat_template_version: 2016-04-08
+
+description: >
+  Openstack Manila base service. Shared by manila-api/scheduler/share services
+
+parameters:
+  EndpointMap:
+    default: {}
+    description: Mapping of service endpoint -> protocol. Typically set
+                 via parameter_defaults in the resource registry.
+    type: json
+  Debug:
+    default: ''
+    description: Set to True to enable debugging on all services.
+    type: string
+  RabbitPassword:
+    description: The password for RabbitMQ
+    type: string
+    hidden: true
+  RabbitUserName:
+    default: guest
+    description: The username for RabbitMQ
+    type: string
+  RabbitClientUseSSL:
+    default: false
+    description: >
+        Rabbit client subscriber parameter to specify
+        an SSL connection to the RabbitMQ host.
+    type: string
+  RabbitClientPort:
+    default: 5672
+    description: Set rabbit subscriber port, change this if using SSL
+    type: number
+  # Config specific parameters, to be provided via parameter_defaults
+  ManilaGenericEnableBackend:
+    type: boolean
+    default: true
+  ManilaGenericBackendName:
+    type: string
+    default: tripleo_generic
+  ManilaGenericDriverHandlesShareServers:
+    type: string
+    default: true
+  ManilaGenericSmbTemplateConfigPath:
+    type: string
+    default: '$state_path/smb.conf'
+  ManilaGenericVolumeNameTemplate:
+    type: string
+    default: 'manila-share-%s'
+  ManilaGenericVolumeSnapshotNameTemplate:
+    type: string
+    default: 'manila-snapshot-%s'
+  ManilaGenericShareMountPath:
+    type: string
+    default: '/shares'
+  ManilaGenericMaxTimeToCreateVolume:
+    type: string
+    default: '180'
+  ManilaGenericMaxTimeToAttach:
+    type: string
+    default: '120'
+  ManilaGenericServiceInstanceSmbConfigPath:
+    type: string
+    default: '$share_mount_path/smb.conf'
+  ManilaGenericShareVolumeFsType:
+    type: string
+    default: 'ext4'
+  ManilaGenericCinderVolumeType:
+    type: string
+    default: ''
+  ManilaGenericServiceInstanceUser:
+    type: string
+    default: ''
+  ManilaGenericServiceInstancePassword: #SET THIS via parameter_defaults
+    type: string
+    hidden: true
+  ManilaGenericServiceInstanceFlavorId:
+    type: number
+    default: 1
+  ManilaGenericServiceNetworkCidr:
+    type: string
+    default: '172.16.0.0/16'
+
+outputs:
+  role_data:
+    description: Role data for the Manila Base service.
+    value:
+      service_name: manila_base
+      config_settings:
+        manila::rabbit_userid: {get_param: RabbitUserName}
+        manila::rabbit_password: {get_param: RabbitPassword}
+        manila::rabbit_use_ssl: {get_param: RabbitClientUseSSL}
+        manila::rabbit_port: {get_param: RabbitClientPort}
+        manila::debug: {get_param: Debug}
+        manila::db::mysql::user: manila
+        manila::db::mysql::host: {get_param: [EndpointMap, MysqlNoBracketsInternal, host]}
+        manila::db::mysql::dbname: manila
+        manila::db::database_db_max_retries: -1
+        manila::db::database_max_retries: -1
+        manila_generic_enable_backend: {get_param: ManilaGenericEnableBackend}
+        manila::backend::generic::title: {get_param: ManilaGenericBackendName}
+        manila::backend::generic::driver_handles_share_servers: {get_param: ManilaGenericDriverHandlesShareServers}
+        manila::backend::generic::smb_template_config_path: {get_param: ManilaGenericSmbTemplateConfigPath}
+        manila::backend::generic::volume_name_template: {get_param: ManilaGenericVolumeNameTemplate}
+        manila::backend::generic::volume_snapshot_name_template: {get_param: ManilaGenericVolumeSnapshotNameTemplate}
+        manila::backend::generic::share_mount_path: {get_param: ManilaGenericShareMountPath}
+        manila::backend::generic::max_time_to_create_volume: {get_param: ManilaGenericMaxTimeToCreateVolume}
+        manila::backend::generic::max_time_to_attach: {get_param: ManilaGenericMaxTimeToAttach}
+        manila::backend::generic::service_instance_smb_config_path: {get_param: ManilaGenericServiceInstanceSmbConfigPath}
+        manila::backend::generic::share_volume_fstype: {get_param: ManilaGenericShareVolumeFsType}
+        manila::backend::generic::cinder_volume_type: {get_param: ManilaGenericCinderVolumeType}
+        manila::service_instance::service_instance_user: {get_param: ManilaGenericServiceInstanceUser}
+        manila::service_instance::service_instance_password: {get_param: ManilaGenericServiceInstancePassword}
+        manila::service_instance::service_instance_flavor_id: {get_param: ManilaGenericServiceInstanceFlavorId}
+        manila::service_instance::service_network_cidr: {get_param: ManilaGenericServiceNetworkCidr}
+        manila::db::mysql::allowed_hosts:
+          - '%'
+          - "%{hiera('mysql_bind_host')}"
+
diff --git a/puppet/services/manila-scheduler.yaml b/puppet/services/manila-scheduler.yaml
new file mode 100644
index 00000000..b1d55a05
--- /dev/null
+++ b/puppet/services/manila-scheduler.yaml
@@ -0,0 +1,57 @@
+heat_template_version: 2016-04-08
+
+description: >
+  Manila-scheduler service configured with Puppet
+
+parameters:
+  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, used by nova-api.
+    hidden: true
+  NeutronPassword:
+    description: The password for the neutron service and db account, used by neutron agents.
+    type: string
+    hidden: true
+  ManilaPassword:
+    description: The password for the manila service account.
+    type: string
+    hidden: true
+
+resources:
+  ManilaBase:
+    type: ./manila-base.yaml
+    properties:
+      EndpointMap: {get_param: EndpointMap}
+
+outputs:
+  role_data:
+    description: Role data for the Manila-scheduler role.
+    value:
+      service_name: manila_scheduler
+      config_settings:
+        map_merge:
+          - get_attr: [ManilaBase, role_data, config_settings]
+          - manila::compute::nova::nova_admin_auth_url: {get_param: [EndpointMap, KeystoneInternal, uri]}
+            manila::compute::nova::nova_admin_password: {get_param: NovaPassword}
+            manila::compute::nova::nova_admin_tenant_name: 'service'
+            manila::db::mysql::password: {get_param: ManilaPassword}
+            manila::network::neutron::neutron_url: {get_param: [EndpointMap, NeutronInternal, uri]}
+            manila::network::neutron::neutron_admin_auth_url: {get_param: [EndpointMap, NeutronAdmin, uri]}
+            manila::network::neutron::neutron_admin_password: {get_param: NeutronPassword}
+            manila::sql_connection:
+                list_join:
+                - ''
+                - - {get_param: [EndpointMap, MysqlInternal, protocol]}
+                  - '://manila:'
+                  - {get_param: ManilaPassword}
+                  - '@'
+                  - {get_param: [EndpointMap, MysqlInternal, host]}
+                  - '/manila'
+      step_config: |
+        include ::tripleo::profile::base::manila::scheduler
+
diff --git a/puppet/services/manila-share.yaml b/puppet/services/manila-share.yaml
new file mode 100644
index 00000000..20f36aa3
--- /dev/null
+++ b/puppet/services/manila-share.yaml
@@ -0,0 +1,29 @@
+heat_template_version: 2016-04-08
+
+description: >
+  Manila-share service configured with Puppet
+
+parameters:
+  EndpointMap:
+    default: {}
+    description: Mapping of service endpoint -> protocol. Typically set
+                 via parameter_defaults in the resource registry.
+    type: json
+
+resources:
+  ManilaBase:
+    type: ./manila-base.yaml
+    properties:
+      EndpointMap: {get_param: EndpointMap}
+
+outputs:
+  role_data:
+    description: Role data for the Manila-share role.
+    value:
+      service_name: manila_share
+      config_settings:
+        map_merge:
+          - get_attr: [ManilaBase, role_data, config_settings]
+          - manila::volume::cinder::cinder_admin_tenant_name: 'service'
+      step_config: |
+        include ::tripleo::profile::base::manila::share
diff --git a/puppet/services/pacemaker/manila-share.yaml b/puppet/services/pacemaker/manila-share.yaml
new file mode 100644
index 00000000..0f88e89c
--- /dev/null
+++ b/puppet/services/pacemaker/manila-share.yaml
@@ -0,0 +1,27 @@
+heat_template_version: 2016-04-08
+
+description: >
+  The manila-share service with Pacemaker configured with Puppet
+
+parameters:
+  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
+
+outputs:
+  role_data:
+    description: Role data for the manila-share pacemaker role.
+    value:
+      service_name: manila_share
+      config_settings:
+        map_merge:
+          - get_attr: [ManilaShareBase, role_data, config_settings]
+      step_config: |
+        include ::tripleo::profile::pacemaker::manila
diff --git a/puppet/vip-config.yaml b/puppet/vip-config.yaml
index 51129053..7ce23a20 100644
--- a/puppet/vip-config.yaml
+++ b/puppet/vip-config.yaml
@@ -23,6 +23,7 @@ resources:
                 glance_registry_vip: {get_input: glance_registry_vip}
                 sahara_api_vip: {get_input: sahara_api_vip}
                 swift_proxy_vip: {get_input: swift_proxy_vip}
+                manila_api_vip: {get_input: manila_api_vip}
                 nova_api_vip: {get_input: nova_api_vip}
                 nova_metadata_vip: {get_input: nova_metadata_vip}
                 ceilometer_api_vip: {get_input: ceilometer_api_vip}