Merge "Refactor iscsi initiator-name reset into separate service"

6 years ago · 84e6bff8a6
parent 32c40b9796 8e5bb308cf
commit 84e6bff8a6
25 changed files with 112 additions and 17 deletions
--- a/ci/environments/multinode-3nodes.yaml
+++ b/ci/environments/multinode-3nodes.yaml
@ -57,6 +57,7 @@
    - OS::TripleO::Services::NovaLibvirt
    - OS::TripleO::Services::MySQLClient
    - OS::TripleO::Services::Sshd
+    - OS::TripleO::Services::Iscsid

 - name: Controller
  CountDefault: 1
@ -79,3 +80,4 @@
    - OS::TripleO::Services::TripleoPackages
    - OS::TripleO::Services::TripleoFirewall
    - OS::TripleO::Services::Sshd
+    - OS::TripleO::Services::Iscsid
--- a/ci/environments/multinode-containers.yaml
+++ b/ci/environments/multinode-containers.yaml
@ -60,6 +60,7 @@ parameter_defaults:
    - OS::TripleO::Services::NovaCompute
    - OS::TripleO::Services::NovaLibvirt
    - OS::TripleO::Services::Sshd
+    - OS::TripleO::Services::Iscsid
  ControllerExtraConfig:
    nova::compute::libvirt::services::libvirt_virt_type: qemu
    nova::compute::libvirt::libvirt_virt_type: qemu
--- a/ci/environments/multinode.yaml
+++ b/ci/environments/multinode.yaml
@ -58,6 +58,7 @@ parameter_defaults:
    - OS::TripleO::Services::Horizon
    - OS::TripleO::Services::TripleoFirewall
    - OS::TripleO::Services::Sshd
+    - OS::TripleO::Services::Iscsid
  ControllerExtraConfig:
    nova::compute::libvirt::services::libvirt_virt_type: qemu
    nova::compute::libvirt::libvirt_virt_type: qemu
--- a/ci/environments/multinode_major_upgrade.yaml
+++ b/ci/environments/multinode_major_upgrade.yaml
@ -57,6 +57,7 @@ parameter_defaults:
    - OS::TripleO::Services::Pacemaker
    - OS::TripleO::Services::Horizon
    - OS::TripleO::Services::Sshd
+    - OS::TripleO::Services::Iscsid
  ControllerExtraConfig:
    nova::compute::libvirt::services::libvirt_virt_type: qemu
    nova::compute::libvirt::libvirt_virt_type: qemu
--- a/ci/environments/scenario001-multinode-containers.yaml
+++ b/ci/environments/scenario001-multinode-containers.yaml
@ -89,6 +89,7 @@ parameter_defaults:
    - OS::TripleO::Services::TripleoFirewall
    - OS::TripleO::Services::FluentdClient
    - OS::TripleO::Services::SensuClient
+    - OS::TripleO::Services::Iscsid

  ControllerExtraConfig:
    nova::compute::libvirt::services::libvirt_virt_type: qemu
--- a/ci/environments/scenario001-multinode.yaml
+++ b/ci/environments/scenario001-multinode.yaml
@ -87,6 +87,7 @@ parameter_defaults:
    - OS::TripleO::Services::TripleoFirewall
    - OS::TripleO::Services::FluentdClient
    - OS::TripleO::Services::SensuClient
+    - OS::TripleO::Services::Iscsid

  ControllerExtraConfig:
    nova::compute::libvirt::services::libvirt_virt_type: qemu
--- a/ci/environments/scenario002-multinode-containers.yaml
+++ b/ci/environments/scenario002-multinode-containers.yaml
@ -67,6 +67,7 @@ parameter_defaults:
    - OS::TripleO::Services::TripleoPackages
    - OS::TripleO::Services::TripleoFirewall
    - OS::TripleO::Services::Sshd
+    - OS::TripleO::Services::Iscsid
  ControllerExtraConfig:
    nova::compute::libvirt::services::libvirt_virt_type: qemu
    nova::compute::libvirt::libvirt_virt_type: qemu
--- a/ci/environments/scenario002-multinode.yaml
+++ b/ci/environments/scenario002-multinode.yaml
@ -66,6 +66,7 @@ parameter_defaults:
    - OS::TripleO::Services::TripleoPackages
    - OS::TripleO::Services::TripleoFirewall
    - OS::TripleO::Services::Sshd
+    - OS::TripleO::Services::Iscsid
  ControllerExtraConfig:
    nova::compute::libvirt::services::libvirt_virt_type: qemu
    nova::compute::libvirt::libvirt_virt_type: qemu
--- a/ci/environments/scenario003-multinode-containers.yaml
+++ b/ci/environments/scenario003-multinode-containers.yaml
@ -62,6 +62,7 @@ parameter_defaults:
    - OS::TripleO::Services::TripleoPackages
    - OS::TripleO::Services::TripleoFirewall
    - OS::TripleO::Services::Sshd
+    - OS::TripleO::Services::Iscsid
  ControllerExtraConfig:
    nova::compute::libvirt::services::libvirt_virt_type: qemu
    nova::compute::libvirt::libvirt_virt_type: qemu
--- a/ci/environments/scenario003-multinode.yaml
+++ b/ci/environments/scenario003-multinode.yaml
@ -59,6 +59,7 @@ parameter_defaults:
    - OS::TripleO::Services::TripleoPackages
    - OS::TripleO::Services::TripleoFirewall
    - OS::TripleO::Services::Sshd
+    - OS::TripleO::Services::Iscsid
  ControllerExtraConfig:
    nova::compute::libvirt::services::libvirt_virt_type: qemu
    nova::compute::libvirt::libvirt_virt_type: qemu
--- a/ci/environments/scenario004-multinode-containers.yaml
+++ b/ci/environments/scenario004-multinode-containers.yaml
@ -77,6 +77,7 @@ parameter_defaults:
    - OS::TripleO::Services::TripleoPackages
    - OS::TripleO::Services::TripleoFirewall
    - OS::TripleO::Services::Sshd
+    - OS::TripleO::Services::Iscsid
  ControllerExtraConfig:
    nova::compute::libvirt::services::libvirt_virt_type: qemu
    nova::compute::libvirt::libvirt_virt_type: qemu
--- a/ci/environments/scenario004-multinode.yaml
+++ b/ci/environments/scenario004-multinode.yaml
@ -77,6 +77,7 @@ parameter_defaults:
    - OS::TripleO::Services::TripleoPackages
    - OS::TripleO::Services::TripleoFirewall
    - OS::TripleO::Services::Sshd
+    - OS::TripleO::Services::Iscsid
  ControllerExtraConfig:
    nova::compute::libvirt::services::libvirt_virt_type: qemu
    nova::compute::libvirt::libvirt_virt_type: qemu
--- a/deployed-server/deployed-server-roles-data.yaml
+++ b/deployed-server/deployed-server-roles-data.yaml
@ -41,6 +41,7 @@
    - OS::TripleO::Services::HeatApiCfn
    - OS::TripleO::Services::HeatApiCloudwatch
    - OS::TripleO::Services::HeatEngine
+    - OS::TripleO::Services::Iscsid
    - OS::TripleO::Services::MySQL
    - OS::TripleO::Services::MySQLClient
    - OS::TripleO::Services::NeutronDhcpAgent
@ -130,6 +131,7 @@
    - OS::TripleO::Services::OpenDaylightOvs
    - OS::TripleO::Services::SensuClient
    - OS::TripleO::Services::FluentdClient
+    - OS::TripleO::Services::Iscsid

 - name: BlockStorageDeployedServer
  disable_constraints: True
--- a/docker/services/cinder-backup.yaml
+++ b/docker/services/cinder-backup.yaml
@ -84,6 +84,10 @@ outputs:
              dest: "/"
              merge: true
              preserve_properties: true
+            - source: "/var/lib/kolla/config_files/src-iscsid/*"
+              dest: "/"
+              merge: true
+              preserve_properties: true
          permissions:
            - path: /var/lib/cinder
              owner: cinder:cinder
@ -113,13 +117,13 @@ outputs:
                -
                  - /var/lib/kolla/config_files/cinder_backup.json:/var/lib/kolla/config_files/config.json:ro
                  - /var/lib/config-data/puppet-generated/cinder/:/var/lib/kolla/config_files/src:ro
+                  - /var/lib/config-data/puppet-generated/iscsid/:/var/lib/kolla/config_files/src-iscsid:ro
                  # FIXME: we need to generate a ceph.conf with puppet for this
                  - /var/lib/config-data/puppet-generated/ceph/:/var/lib/kolla/config_files/src-ceph:ro
                  - /dev/:/dev/
                  - /run/:/run/
                  - /sys:/sys
                  - /lib/modules:/lib/modules:ro
-                  - /etc/iscsi:/etc/iscsi
                  - /var/lib/cinder:/var/lib/cinder
                  - /var/log/containers/cinder:/var/log/cinder
            environment:
--- a/docker/services/cinder-volume.yaml
+++ b/docker/services/cinder-volume.yaml
@ -98,6 +98,10 @@ outputs:
              dest: "/"
              merge: true
              preserve_properties: true
+            - source: "/var/lib/kolla/config_files/src-iscsid/*"
+              dest: "/"
+              merge: true
+              preserve_properties: true
          permissions:
            - path: /var/log/cinder
              owner: cinder:cinder
@ -124,13 +128,13 @@ outputs:
                -
                  - /var/lib/kolla/config_files/cinder_volume.json:/var/lib/kolla/config_files/config.json:ro
                  - /var/lib/config-data/puppet-generated/cinder/:/var/lib/kolla/config_files/src:ro
+                  - /var/lib/config-data/puppet-generated/iscsid/:/var/lib/kolla/config_files/src-iscsid:ro
                  # FIXME: we need to generate a ceph.conf with puppet for this
                  - /var/lib/config-data/puppet-generated/ceph/:/var/lib/kolla/config_files/src-ceph:ro
                  - /lib/modules:/lib/modules:ro
                  - /dev/:/dev/
                  - /run/:/run/
                  - /sys:/sys
-                  - /etc/iscsi:/etc/iscsi
                  - /var/lib/cinder:/var/lib/cinder
                  - /var/log/containers/cinder:/var/log/cinder
            environment:
--- a/docker/services/iscsid.yaml
+++ b/docker/services/iscsid.yaml
@ -42,23 +42,38 @@ resources:
  ContainersCommon:
    type: ./containers-common.yaml

+  IscsidBase:
+    type: ../../puppet/services/iscsid.yaml
+    properties:
+      EndpointMap: {get_param: EndpointMap}
+      ServiceNetMap: {get_param: ServiceNetMap}
+      DefaultPasswords: {get_param: DefaultPasswords}
+      RoleName: {get_param: RoleName}
+      RoleParameters: {get_param: RoleParameters}
+
 outputs:
  role_data:
-    description: Role data for the Iscsid API role.
+    description: Role data for the Iscsid role.
    value:
-      service_name: iscsid
-      config_settings: {}
-      step_config: ''
-      service_config_settings: {}
+      service_name: {get_attr: [IscsidBase, role_data, service_name]}
+      config_settings: {get_attr: [IscsidBase, role_data, config_settings]}
+      step_config: &step_config
+        {get_attr: [IscsidBase, role_data, step_config]}
+      service_config_settings: {get_attr: [IscsidBase, role_data, service_config_settings]}
      # BEGIN DOCKER SETTINGS
      puppet_config:
        config_volume: iscsid
-        #puppet_tags: file
-        step_config: ''
+        puppet_tags: iscsid_config
+        step_config: *step_config
        config_image: {get_param: DockerIscsidConfigImage}
      kolla_config:
        /var/lib/kolla/config_files/iscsid.json:
          command: /usr/sbin/iscsid -f
+          config_files:
+            - source: "/var/lib/kolla/config_files/src-iscsid/*"
+              dest: "/"
+              merge: true
+              preserve_properties: true
      docker_config:
        step_3:
          iscsid:
@ -76,14 +91,10 @@ outputs:
                  - /run/:/run/
                  - /sys:/sys
                  - /lib/modules:/lib/modules:ro
-                  - /etc/iscsi:/etc/iscsi
+                  - /var/lib/config-data/puppet-generated/iscsid/:/var/lib/kolla/config_files/src-iscsid:ro
            environment:
              - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
      host_prep_tasks:
-        - name: create /etc/iscsi
-          file:
-            path: /etc/iscsi
-            state: directory
        - name: stat /lib/systemd/system/iscsid.socket
          stat: path=/lib/systemd/system/iscsid.socket
          register: stat_iscsid_socket
--- a/docker/services/multipathd.yaml
+++ b/docker/services/multipathd.yaml
@ -59,6 +59,11 @@ outputs:
      kolla_config:
        /var/lib/kolla/config_files/multipathd.json:
          command: /usr/sbin/multipathd -d
+        config_files:
+          - source: "/var/lib/kolla/config_files/src-iscsid/*"
+            dest: "/"
+            merge: true
+            preserve_properties: true
      docker_config:
        step_3:
          multipathd:
@ -72,11 +77,11 @@ outputs:
                - {get_attr: [ContainersCommon, volumes]}
                -
                  - /var/lib/kolla/config_files/multipathd.json:/var/lib/kolla/config_files/config.json:ro
+                  - /var/lib/config-data/puppet-generated/iscsid/:/var/lib/kolla/config_files/src-iscsid:ro
                  - /dev/:/dev/
                  - /run/:/run/
                  - /sys:/sys
                  - /lib/modules:/lib/modules:ro
-                  - /etc/iscsi:/etc/iscsi
                  - /var/lib/cinder:/var/lib/cinder
            environment:
              - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
--- a/docker/services/nova-compute.yaml
+++ b/docker/services/nova-compute.yaml
@ -81,6 +81,10 @@ outputs:
              dest: "/"
              merge: true
              preserve_properties: true
+            - source: "/var/lib/kolla/config_files/src-iscsid/*"
+              dest: "/"
+              merge: true
+              preserve_properties: true
          permissions:
            - path: /var/log/nova
              owner: nova:nova
@ -103,8 +107,8 @@ outputs:
                -
                  - /var/lib/kolla/config_files/nova_compute.json:/var/lib/kolla/config_files/config.json:ro
                  - /var/lib/config-data/puppet-generated/nova_libvirt/:/var/lib/kolla/config_files/src:ro
+                  - /var/lib/config-data/puppet-generated/iscsid/:/var/lib/kolla/config_files/src-iscsid:ro
                  - /dev:/dev
-                  - /etc/iscsi:/etc/iscsi
                  - /lib/modules:/lib/modules:ro
                  - /run:/run
                  - /var/lib/nova:/var/lib/nova
--- a/docker/services/nova-ironic.yaml
+++ b/docker/services/nova-ironic.yaml
@ -73,6 +73,10 @@ outputs:
              dest: "/"
              merge: true
              preserve_properties: true
+            - source: "/var/lib/kolla/config_files/src-iscsid/*"
+              dest: "/"
+              merge: true
+              preserve_properties: true
          permissions:
            - path: /var/log/nova
              owner: nova:nova
@ -94,9 +98,9 @@ outputs:
                -
                  - /var/lib/kolla/config_files/nova_ironic.json:/var/lib/kolla/config_files/config.json:ro
                  - /var/lib/config-data/puppet-generated/nova/:/var/lib/kolla/config_files/src:ro
+                  - /var/lib/config-data/puppet-generated/iscsid/:/var/lib/kolla/config_files/src-iscsid:ro
                  - /run:/run
                  - /dev:/dev
-                  - /etc/iscsi:/etc/iscsi
                  - /var/lib/nova/:/var/lib/nova
                  - /var/log/containers/nova:/var/log/nova
            environment:
--- a/environments/contrail/roles_data_contrail.yaml
+++ b/environments/contrail/roles_data_contrail.yaml
@ -109,6 +109,7 @@
    - OS::TripleO::Services::CinderHPELeftHandISCSI
    - OS::TripleO::Services::Etcd
    - OS::TripleO::Services::AuditD
+    - OS::TripleO::Services::Iscsid

 - name: Compute
  CountDefault: 1
@ -138,6 +139,7 @@
    - OS::TripleO::Services::SensuClient
    - OS::TripleO::Services::FluentdClient
    - OS::TripleO::Services::AuditD
+    - OS::TripleO::Services::Iscsid

 - name: BlockStorage
  ServicesDefault:
@ -205,6 +207,7 @@
    - OS::TripleO::Services::TripleoPackages
    - OS::TripleO::Services::SensuClient
    - OS::TripleO::Services::FluentdClient
+    - OS::TripleO::Services::Iscsid

 - name: ContrailAnalytics
  ServicesDefault:
--- a/environments/docker-services-tls-everywhere.yaml
+++ b/environments/docker-services-tls-everywhere.yaml
@ -20,6 +20,7 @@ resource_registry:
  OS::TripleO::Services::HeatApi: ../docker/services/heat-api.yaml
  OS::TripleO::Services::HeatApiCfn: ../docker/services/heat-api-cfn.yaml
  OS::TripleO::Services::HeatEngine: ../docker/services/heat-engine.yaml
+  OS::TripleO::Services::Iscsid: ../docker/services/iscsid.yaml
  OS::TripleO::Services::Keystone: ../docker/services/keystone.yaml
  OS::TripleO::Services::NeutronApi: ../docker/services/neutron-api.yaml
  OS::TripleO::Services::NeutronCorePlugin: ../docker/services/neutron-plugin-ml2.yaml
--- a/overcloud-resource-registry-puppet.j2.yaml
+++ b/overcloud-resource-registry-puppet.j2.yaml
@ -170,6 +170,7 @@ resource_registry:
  OS::TripleO::Services::HAproxy: puppet/services/haproxy.yaml
  OS::TripleO::Services::HAProxyPublicTLS: OS::Heat::None
  OS::TripleO::Services::HAProxyInternalTLS: OS::Heat::None
+  OS::TripleO::Services::Iscsid: puppet/services/iscsid.yaml
  OS::TripleO::Services::Keepalived: puppet/services/keepalived.yaml
  OS::TripleO::Services::Memcached: puppet/services/memcached.yaml
  OS::TripleO::Services::SaharaApi: OS::Heat::None
--- a/puppet/services/iscsid.yaml
+++ b/puppet/services/iscsid.yaml
@ -0,0 +1,41 @@
+heat_template_version: pike
+
+description: >
+  Configure iscsid
+
+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
+
+outputs:
+  role_data:
+    description: Role data for iscsid
+    value:
+      service_name: iscsid
+      config_setting: {}
+      step_config: |
+        include ::tripleo::profile::base::iscsid
--- a/roles/ControllerOpenstack.yaml
+++ b/roles/ControllerOpenstack.yaml
@ -57,6 +57,7 @@
    - OS::TripleO::Services::Horizon
    - OS::TripleO::Services::IronicApi
    - OS::TripleO::Services::IronicConductor
+    - OS::TripleO::Services::Iscsid
    - OS::TripleO::Services::Keepalived
    - OS::TripleO::Services::Kernel
    - OS::TripleO::Services::Keystone
--- a/roles/README.rst
+++ b/roles/README.rst
@ -152,6 +152,7 @@ Example
   * OS::TripleO::Services::ComputeNeutronOvsAgent
   * OS::TripleO::Services::Docker
   * OS::TripleO::Services::FluentdClient
+   * OS::TripleO::Services::Iscsid
   * OS::TripleO::Services::Kernel
   * OS::TripleO::Services::MySQLClient
   * OS::TripleO::Services::NeutronSriovAgent