Add docker templates for octavia services

Depends-On: I270f3f6879737fc29370165e4a8fa8c9c19fffb3
Depends-On: I3a169e3321a26ee373ab873426a2d58acbcfe1bd
Closes-Bug: #1668932

Co-Authored-By: Or Idgar <oidgar@redhat.com>
Co-Authored-By: Brent Eagles <beagles@redhat.com>
Co-Authored-By: Martin André <m.andre@redhat.com>
Change-Id: I211707072bb0e4ac4aa48e9bbaccb7530f3de0ca

diff --git a/docker/services/octavia-api.yaml b/docker/services/octavia-api.yaml
new file mode 100644 (file)
index 0000000..247dcba
--- /dev/null
+++ b/docker/services/octavia-api.yaml
@@ -0,0 +1,148 @@
+heat_template_version: pike
+
+description: >
+  OpenStack Octavia service configured with Puppet
+
+parameters:
+  DockerNamespace:
+    description: namespace
+    default: 'tripleoupstream'
+    type: string
+  DockerOctaviaApiImage:
+    description: image
+    default: 'centos-binary-octavia-api:latest'
+    type: string
+  EndpointMap:
+    default: {}
+    description: Mapping of service endpoint -> protocol. Typically set
+                 via parameter_defaults in the resource registry.
+    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
+  EnableInternalTLS:
+    type: boolean
+    default: false
+
+conditions:
+
+  internal_tls_enabled: {equals: [{get_param: EnableInternalTLS}, true]}
+
+
+resources:
+
+  ContainersCommon:
+    type: ./containers-common.yaml
+
+  OctaviaApiPuppetBase:
+    type: ../../puppet/services/octavia-api.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 Octavia API role.
+    value:
+      service_name: {get_attr: [OctaviaApiPuppetBase, role_data, service_name]}
+      config_settings: {get_attr: [OctaviaApiPuppetBase, role_data, config_settings]}
+      step_config: &step_config
+        get_attr: [OctaviaApiPuppetBase, role_data, step_config]
+      service_config_settings: {get_attr: [OctaviaApiPuppetBase, role_data, service_config_settings]}
+      # BEGIN DOCKER SETTINGS #
+      puppet_config:
+        config_volume: octavia
+        puppet_tags: octavia_config
+        step_config: *step_config
+        config_image: &octavia_image
+          list_join:
+            - '/'
+            - [ {get_param: DockerNamespace}, {get_param: DockerOctaviaApiImage} ]
+      kolla_config:
+        /var/lib/kolla/config_files/octavia_api.json:
+          command: /usr/bin/octavia-api --config-file /usr/share/octavia/octavia-dist.conf --config-file /etc/octavia/octavia.conf --log-file /var/log/octavia/api.log --config-dir /etc/octavia/conf.d/common --config-dir /etc/octavia/conf.d/octavia-api
+        /var/lib/kolla/config_files/octavia_api_tls_proxy.json:
+          command: /usr/sbin/httpd -DFOREGROUND
+      docker_config:
+        # Kolla_bootstrap/db_sync runs before permissions set by kolla_config
+        step_2:
+          octavia_api_init_dirs:
+            start_order: 0
+            image: *octavia_image
+            user: root
+            volumes:
+              - /var/lib/config-data/octavia/etc/octavia:/etc/octavia/
+              - /var/log/containers/octavia:/var/log/octavia
+            command: ['/bin/bash', '-c', 'mkdir -p /etc/octavia/conf.d/octavia-api; chown -R octavia:octavia /etc/octavia/conf.d/octavia-api; chown -R octavia:octavia /var/log/octavia']
+        step_3:
+          octavia_db_sync:
+            start_order: 0
+            image: *octavia_image
+            net: host
+            privileged: false
+            detach: false
+            user: root
+            volumes: &octavia_volumes
+              list_concat:
+                - {get_attr: [ContainersCommon, volumes]}
+                -
+                  - /var/lib/kolla/config_files/octavia_api.json:/var/lib/kolla/config_files/config.json:ro
+                  - /var/lib/config-data/octavia/etc/octavia/:/etc/octavia/:ro
+                  - /var/log/containers/octavia:/var/log/octavia
+            command: "/usr/bin/bootstrap_host_exec octavia_api su octavia -s /bin/bash -c '/usr/bin/octavia-db-manage upgrade head'"
+        step_4:
+          map_merge:
+            - octavia_api:
+                start_order: 2
+                image: *octavia_image
+                net: host
+                privileged: false
+                restart: always
+                volumes: *octavia_volumes
+                environment:
+                  - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
+            - if:
+                - internal_tls_enabled
+                - octavia_api_tls_proxy:
+                    start_order: 2
+                    image: *octavia_image
+                    net: host
+                    user: root
+                    restart: always
+                    volumes:
+                      list_concat:
+                        - {get_attr: [ContainersCommon, volumes]}
+                        -
+                          - /var/lib/kolla/config_files/octavia_api_tls_proxy.json:/var/lib/kolla/config_files/config.json:ro
+                          - /var/lib/config-data/octavia/etc/httpd/:/etc/httpd/:ro
+                          - /etc/pki/tls/certs/httpd:/etc/pki/tls/certs/httpd:ro
+                          - /etc/pki/tls/private/httpd:/etc/pki/tls/private/httpd:ro
+                    environment:
+                      - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
+                - {}
+      host_prep_tasks:
+        - name: create persistent logs directory
+          file:
+            path: /var/log/containers/octavia
+            state: directory
+      upgrade_tasks:
+        - name: Stop and disable octavia_api service
+          tags: step2
+          service: name=openstack-octavia-api state=stopped enabled=no

diff --git a/docker/services/octavia-health-manager.yaml b/docker/services/octavia-health-manager.yaml
new file mode 100644 (file)
index 0000000..534a35f
--- /dev/null
+++ b/docker/services/octavia-health-manager.yaml
@@ -0,0 +1,107 @@
+heat_template_version: pike
+
+description: >
+  OpenStack Octavia health-manager service configured with Puppet
+
+parameters:
+  DockerNamespace:
+    description: namespace
+    default: 'tripleoupstream'
+    type: string
+  DockerOctaviaHealthManagerImage:
+    description: image
+    default: 'centos-binary-octavia-health-manager:latest'
+    type: string
+  EndpointMap:
+    default: {}
+    description: Mapping of service endpoint -> protocol. Typically set
+                 via parameter_defaults in the resource registry.
+    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
+
+
+resources:
+
+  ContainersCommon:
+    type: ./containers-common.yaml
+
+  OctaviaHealthManagerPuppetBase:
+    type: ../../puppet/services/octavia-health-manager.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 Octavia health-manager role.
+    value:
+      service_name: {get_attr: [OctaviaHealthManagerPuppetBase, role_data, service_name]}
+      config_settings: {get_attr: [OctaviaHealthManagerPuppetBase, role_data, config_settings]}
+      step_config: &step_config
+        get_attr: [OctaviaHealthManagerPuppetBase, role_data, step_config]
+      service_config_settings: {get_attr: [OctaviaHealthManagerPuppetBase, role_data, service_config_settings]}
+      # BEGIN DOCKER SETTINGS #
+      puppet_config:
+        config_volume: octavia
+        puppet_tags: octavia_config
+        step_config: *step_config
+        config_image: &octavia_image
+          list_join:
+            - '/'
+            - [ {get_param: DockerNamespace}, {get_param: DockerOctaviaHealthManagerImage} ]
+      kolla_config:
+        /var/lib/kolla/config_files/octavia_health_manager.json:
+          command: /usr/bin/octavia-health-manager --config-file /usr/share/octavia/octavia-dist.conf --config-file /etc/octavia/octavia.conf --log-file /var/log/octavia/health-manager.log --config-dir /etc/octavia/conf.d/common --config-dir /etc/octavia/conf.d/octavia-health-manager
+      docker_config:
+        step_2:
+          octavia_health_manager_init_dirs:
+            start_order: 0
+            image: *octavia_image
+            user: root
+            volumes:
+              - /var/lib/config-data/octavia/etc/octavia:/etc/octavia/
+            command: ['/bin/bash', '-c', 'mkdir -p /etc/octavia/conf.d/octavia-health-manager; chown -R octavia:octavia /etc/octavia/conf.d/octavia-health-manager']
+        step_4:
+          octavia_health_manager:
+            start_order: 2
+            image: *octavia_image
+            net: host
+            privileged: false
+            restart: always
+            volumes:
+              list_concat:
+                - {get_attr: [ContainersCommon, volumes]}
+                -
+                  - /var/lib/kolla/config_files/octavia_health_manager.json:/var/lib/kolla/config_files/config.json:ro
+                  - /var/lib/config-data/octavia/etc/octavia/:/etc/octavia/:ro
+                  - /var/log/containers/octavia:/var/log/octavia
+            environment:
+              - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
+      host_prep_tasks:
+        - name: create persistent logs directory
+          file:
+            path: /var/log/containers/octavia
+            state: directory
+      upgrade_tasks:
+        - name: Stop and disable octavia_health_manager service
+          tags: step2
+          service: name=openstack-octavia-health-manager state=stopped enabled=no

diff --git a/docker/services/octavia-housekeeping.yaml b/docker/services/octavia-housekeeping.yaml
new file mode 100644 (file)
index 0000000..ed20310
--- /dev/null
+++ b/docker/services/octavia-housekeeping.yaml
@@ -0,0 +1,107 @@
+heat_template_version: pike
+
+description: >
+  OpenStack Octavia service configured with Puppet
+
+parameters:
+  DockerNamespace:
+    description: namespace
+    default: 'tripleoupstream'
+    type: string
+  DockerOctaviaHousekeepingImage:
+    description: image
+    default: 'centos-binary-octavia-housekeeping:latest'
+    type: string
+  EndpointMap:
+    default: {}
+    description: Mapping of service endpoint -> protocol. Typically set
+                 via parameter_defaults in the resource registry.
+    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
+
+
+resources:
+
+  ContainersCommon:
+    type: ./containers-common.yaml
+
+  OctaviaHousekeepingPuppetBase:
+    type: ../../puppet/services/octavia-housekeeping.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 Octavia housekeeping role.
+    value:
+      service_name: {get_attr: [OctaviaHousekeepingPuppetBase, role_data, service_name]}
+      config_settings: {get_attr: [OctaviaHousekeepingPuppetBase, role_data, config_settings]}
+      step_config: &step_config
+        get_attr: [OctaviaHousekeepingPuppetBase, role_data, step_config]
+      service_config_settings: {get_attr: [OctaviaHousekeepingPuppetBase, role_data, service_config_settings]}
+      # BEGIN DOCKER SETTINGS #
+      puppet_config:
+        config_volume: octavia
+        puppet_tags: octavia_config
+        step_config: *step_config
+        config_image: &octavia_image
+          list_join:
+            - '/'
+            - [ {get_param: DockerNamespace}, {get_param: DockerOctaviaHousekeepingImage} ]
+      kolla_config:
+        /var/lib/kolla/config_files/octavia_housekeeping.json:
+          command: /usr/bin/octavia-housekeeping --config-file /usr/share/octavia/octavia-dist.conf --config-file /etc/octavia/octavia.conf --log-file /var/log/octavia/housekeeping.log --config-dir /etc/octavia/conf.d/common --config-dir /etc/octavia/conf.d/octavia-housekeeping
+      docker_config:
+        step_2:
+          octavia_housekeeping_init_dirs:
+            start_order: 0
+            image: *octavia_image
+            user: root
+            volumes:
+              - /var/lib/config-data/octavia/etc/octavia:/etc/octavia/
+            command: ['/bin/bash', '-c', 'mkdir -p /etc/octavia/conf.d/octavia-housekeeping; chown -R octavia:octavia /etc/octavia/conf.d/octavia-housekeeping']
+        step_4:
+          octavia_housekeeping:
+            start_order: 2
+            image: *octavia_image
+            net: host
+            privileged: false
+            restart: always
+            volumes:
+              list_concat:
+                - {get_attr: [ContainersCommon, volumes]}
+                -
+                  - /var/lib/kolla/config_files/octavia_housekeeping.json:/var/lib/kolla/config_files/config.json:ro
+                  - /var/lib/config-data/octavia/etc/octavia/:/etc/octavia/:ro
+                  - /var/log/containers/octavia:/var/log/octavia
+            environment:
+              - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
+      host_prep_tasks:
+        - name: create persistent logs directory
+          file:
+            path: /var/log/containers/octavia
+            state: directory
+      upgrade_tasks:
+        - name: Stop and disable octavia_housekeeping service
+          tags: step2
+          service: name=openstack-octavia-housekeeping state=stopped enabled=no

diff --git a/docker/services/octavia-worker.yaml b/docker/services/octavia-worker.yaml
new file mode 100644 (file)
index 0000000..77d1a59
--- /dev/null
+++ b/docker/services/octavia-worker.yaml
@@ -0,0 +1,107 @@
+heat_template_version: pike
+
+description: >
+  OpenStack Octavia worker service configured with Puppet
+
+parameters:
+  DockerNamespace:
+    description: namespace
+    default: 'tripleoupstream'
+    type: string
+  DockerOctaviaWorkerImage:
+    description: image
+    default: 'centos-binary-octavia-worker:latest'
+    type: string
+  EndpointMap:
+    default: {}
+    description: Mapping of service endpoint -> protocol. Typically set
+                 via parameter_defaults in the resource registry.
+    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
+
+
+resources:
+
+  ContainersCommon:
+    type: ./containers-common.yaml
+
+  OctaviaWorkerPuppetBase:
+    type: ../../puppet/services/octavia-worker.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 Octavia worker role.
+    value:
+      service_name: {get_attr: [OctaviaWorkerPuppetBase, role_data, service_name]}
+      config_settings: {get_attr: [OctaviaWorkerPuppetBase, role_data, config_settings]}
+      step_config: &step_config
+        get_attr: [OctaviaWorkerPuppetBase, role_data, step_config]
+      service_config_settings: {get_attr: [OctaviaWorkerPuppetBase, role_data, service_config_settings]}
+      # BEGIN DOCKER SETTINGS #
+      puppet_config:
+        config_volume: octavia
+        puppet_tags: octavia_config
+        step_config: *step_config
+        config_image: &octavia_image
+          list_join:
+            - '/'
+            - [ {get_param: DockerNamespace}, {get_param: DockerOctaviaWorkerImage} ]
+      kolla_config:
+        /var/lib/kolla/config_files/octavia_worker.json:
+          command: /usr/bin/octavia-worker --config-file /usr/share/octavia/octavia-dist.conf --config-file /etc/octavia/octavia.conf --log-file /var/log/octavia/worker.log --config-dir /etc/octavia/conf.d/common --config-dir /etc/octavia/conf.d/octavia-worker
+      docker_config:
+        step_2:
+          octavia_worker_init_dirs:
+            start_order: 0
+            image: *octavia_image
+            user: root
+            volumes:
+              - /var/lib/config-data/octavia/etc/octavia:/etc/octavia/
+            command: ['/bin/bash', '-c', 'mkdir -p /etc/octavia/conf.d/octavia-worker; chown -R octavia:octavia /etc/octavia/conf.d/octavia-worker']
+        step_4:
+          octavia_worker:
+            start_order: 2
+            image: *octavia_image
+            net: host
+            privileged: false
+            restart: always
+            volumes:
+              list_concat:
+                - {get_attr: [ContainersCommon, volumes]}
+                -
+                  - /var/lib/kolla/config_files/octavia_worker.json:/var/lib/kolla/config_files/config.json:ro
+                  - /var/lib/config-data/octavia/etc/octavia/:/etc/octavia/:ro
+                  - /var/log/containers/octavia:/var/log/octavia
+            environment:
+              - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
+      host_prep_tasks:
+        - name: create persistent logs directory
+          file:
+            path: /var/log/containers/octavia
+            state: directory
+      upgrade_tasks:
+        - name: Stop and disable octavia_worker service
+          tags: step2
+          service: name=openstack-octavia-worker state=stopped enabled=no

diff --git a/environments/services-docker/octavia.yaml b/environments/services-docker/octavia.yaml
new file mode 100644 (file)
index 0000000..b677a4f
--- /dev/null
+++ b/environments/services-docker/octavia.yaml
@@ -0,0 +1,5 @@
+resource_registry:
+  OS::TripleO::Services::OctaviaApi: ../../docker/services/octavia-api.yaml
+  OS::TripleO::Services::OctaviaHousekeeping: ../../docker/services/octavia-housekeeping.yaml
+  OS::TripleO::Services::OctaviaHealthManager: ../../docker/services/octavia-health-manager.yaml
+  OS::TripleO::Services::OctaviaWorker: ../../docker/services/octavia-worker.yaml