Merge pull request #59 from PaaS-TA/working-5.1.14

[service-deployment] Working 5.1.14

Author: okpc579

gateway-service/gateway-service.yml

@@ -3,9 +3,9 @@ name: gateway-service
 
 releases:
 - name: paasta-api-gateway-service
-  url: https://nextcloud.paas-ta.org/index.php/s/k3RJAHzBAHwcLgk/download
-  sha1: 63cbe2ede271d8a349febfc8d2d2468b725fbe26
-  version: "1.1.5"
+  url: https://nextcloud.paas-ta.org/index.php/s/HCMjr2eKfWQSE3Z/download
+  sha1: 04a79d50844c2cea018e6b6fcb294dee8572ef85
+  version: "1.1.6"
 
 stemcells:
 - alias: default

gateway-service/vars.yml

@@ -1,6 +1,6 @@
 # STEMCELL
 stemcell_os: "ubuntu-bionic"                                         # stemcell os
-stemcell_version: "1.92"                                           # stemcell version
+stemcell_version: "1.97"                                           # stemcell version
 
 # VM_TYPE
 vm_type_default: "medium"                                            # vm type default

glusterfs/glusterfs.yml

@@ -2,9 +2,9 @@ name: glusterfs                       # 서비스 배포이름(필수)
 
 releases:
 - name: paasta-glusterfs             # 서비스 릴리즈 이름(필수)
-  url: https://nextcloud.paas-ta.org/index.php/s/x25jxQGGt9JP6M7/download
-  sha1: f24e126a1a951a6e35c144e69ad9272f337f4aed
-  version: "2.1.4"                   # 서비스 릴리즈 버전(필수):latest 시 업로드된 서비스 릴리즈 최신버전
+  url: https://nextcloud.paas-ta.org/index.php/s/NC4QPtNMfxWEyoi/download
+  sha1: 286d4243497df405025bc08c32a85437497969d6
+  version: "2.1.5"                   # 서비스 릴리즈 버전(필수):latest 시 업로드된 서비스 릴리즈 최신버전
 
 update:
   canaries: 1                        # canary 인스턴스 수(필수)

glusterfs/vars.yml

@@ -1,6 +1,6 @@
 # STEMCELL
 stemcell_os: "ubuntu-bionic"                                     # stemcell os
-stemcell_version: "1.92"                                       # stemcell version
+stemcell_version: "1.97"                                       # stemcell version
 
 
 # NETWORK

lifecycle-service/lifecycle-service.yml

@@ -3,9 +3,9 @@ name: lifecycle-service
 
 releases:
 - name: paasta-app-lifecycle-service
-  url: https://nextcloud.paas-ta.org/index.php/s/yYoE66cwNkfn92F/download
-  version: "1.1.3"
-  sha1: 08cf8050664530affd563f951eea825a86a1c0ef 
+  url: https://nextcloud.paas-ta.org/index.php/s/GEjdo4Ss2DGwkG9/download
+  version: "1.1.4"
+  sha1: b18e46f7bb91b05d11d41d1c028afe8d7c26db2c
 
 stemcells:
 - alias: default

lifecycle-service/vars.yml

@@ -1,6 +1,6 @@
 # STEMCELL
 stemcell_os: "ubuntu-bionic"                                                         # stemcell os
-stemcell_version: "1.92"                                                           # stemcell version
+stemcell_version: "1.97"                                                           # stemcell version
 
 # VM_TYPE
 vm_type_default: "medium"                                                            # vm type default

mongodb/vars.yml

@@ -1,6 +1,6 @@
 # STEMCELL
 stemcell_os: "ubuntu-bionic"                                     # stemcell os
-stemcell_version: "1.92"                                       # stemcell version
+stemcell_version: "1.97"                                       # stemcell version
 
 # NETWORK
 private_networks_name: "default"                                 # private network name

mysql/mysql.yml

@@ -7,13 +7,21 @@ addons:
     release: bpm
 
 releases:
+- name: "pxc"
+  sha1: 495099d35e3b2a24bf73ed42c152e1ff10cb3576
+  url: https://bosh.io/d/github.com/cloudfoundry-incubator/pxc-release?v=0.44.0
+  version: 0.44.0
+- name: paasta-conf
+  url:  https://nextcloud.paas-ta.org/index.php/s/2zz3xPqEErCPq3y/download
+  version: 1.0.7
 - name: paasta-mysql
-  url: https://nextcloud.paas-ta.org/index.php/s/nZXWPTT8R8GLxWk/download
-  version: "2.1.4"
-  sha1: 4bc60c9093bbccfcace3d907493b7f6fa764c2a4
+  sha1: d505992214d0dd9c1c681df57e228ccbf7325170
+  url: https://nextcloud.paas-ta.org/index.php/s/i7FSCrTYHdFcKKE/download
+  version: 2.2.0
 
 - name: bpm
   version: latest
+ 
 stemcells:
 - alias: default
   os: ((stemcell_os))
@@ -26,71 +34,101 @@ update:
   max_in_flight: 1
   serial: true
 
+#features:
+#  use_dns_addresses: false
+
 instance_groups:
 - name: mysql
-  instances: ((mysql_instances))
+  migrated_from:
+  - name: mysql
   azs: ((mysql_azs))
-  networks:
-  - name: ((private_networks_name))
+  persistent_disk_type: ((mysql_persistent_disk_type))
+  instances: ((mysql_instances))
   vm_type: ((mysql_vm_type))
   stemcell: default
-  persistent_disk_type: ((mysql_persistent_disk_type))
+  update:
+    serial: true
+  networks:
+  - name: default
   jobs:
-  - name: mysql
-    release: paasta-mysql
+  - name: pxc-mysql
+    release: pxc
     properties:
-      cf_mysql:
-        mysql:
-          port: ((mysql_port))
-          admin_password: ((mysql_admin_password))
-          cluster_health:
-            password: "((mysql_cluster_health_password))"
-          galera_healthcheck:
-            endpoint_password: "((mysql_galera_healthcheck_endpoint_password))"
-            db_password: "((mysql_galera_healthcheck_db_password))"
-  - name: smoke-tests-user
-    release: paasta-mysql
+      admin_password: ((mysql_admin_password))
+      engine_config:
+        binlog:
+          enabled: false
+        galera:
+          enabled: true
+      port: ((mysql_port))
+      tls:
+        galera: ((galera_server_certificate))
+        server: ((mysql_server_certificate))
+  - name: galera-agent
+    release: pxc
     properties:
-      cf_mysql:
-        smoke_tests:
-          db_password: "((mysql_smoke_tests_db_password))"
-
-- name: arbitrator
-  instances: ((arbitrator_instances))
-  azs: ((arbitrator_azs))
-  networks:
-  - name: ((private_networks_name))
-  vm_type: ((arbitrator_vm_type))
-  stemcell: default
-  jobs:
-  - release: paasta-mysql
-    name: arbitrator
+      db_password: ((cf_mysql_mysql_galera_healthcheck_password))
+      endpoint_password: ((cf_mysql_mysql_galera_healthcheck_endpoint_password))
+  - name: gra-log-purger
+    release: pxc
+  - name: cluster-health-logger
+    release: pxc
+    properties:
+      db_password: ((cf_mysql_mysql_cluster_health_password))
+  - name: bootstrap
+    release: pxc
+  - name: db_init_script
+    release: paasta-conf
     properties:
-      cf_mysql:
-        mysql:
-          admin_password: ((mysql_admin_password))
-          galera_healthcheck:
-            endpoint_password: "((mysql_galera_healthcheck_endpoint_password))"
+      delay_time: 10
+      db_client_path: /var/vcap/packages/pxc/bin/mysql
+      db_username: root
+      db_password: ((mysql_admin_password))
+      socket_path: /var/vcap/sys/run/pxc-mysql/mysqld.sock
+      database_type: mysql
+      init_sql: |-
+        CREATE DATABASE IF NOT EXISTS broker;
+        USE broker;
+        CREATE TABLE IF NOT EXISTS `service_binding` (
+          `binding_id` varchar(100) NOT NULL DEFAULT '',
+          `instance_id` varchar(100) DEFAULT NULL,
+          `username` varchar(100) DEFAULT NULL,
+          `password` varchar(100) DEFAULT NULL,
+          `app_id` varchar(100) DEFAULT NULL,
+          PRIMARY KEY (`binding_id`)
+        ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
+        CREATE TABLE IF NOT EXISTS `service_instances` (
+          `instance_id` varchar(100) NOT NULL,
+          `service_id` varchar(100) NOT NULL,
+          `plan_id` varchar(100) NOT NULL,
+          `organization_guid` varchar(100) NOT NULL,
+          `space_guid` varchar(100) NOT NULL,
+          PRIMARY KEY (`instance_id`)
+        ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
+        CREATE USER IF NOT EXISTS 'root'@'((proxy_static_ip))' IDENTIFIED BY '((mysql_admin_password))';
+        ALTER USER IF EXISTS 'root'@'((proxy_static_ip))' IDENTIFIED BY '((mysql_admin_password))';
+        GRANT ALL PRIVILEGES ON *.* TO 'root'@'((proxy_static_ip))' WITH GRANT OPTION;
+        flush privileges;
+
+
 
 - name: proxy
-  instances: ((proxy_instances))
+  instances: 1
   azs: ((proxy_azs))
   networks:
   - name: ((private_networks_name))
+    static_ips: [((proxy_static_ip))]
   vm_type: ((proxy_vm_type))
   stemcell: default
   jobs:
   - name: proxy
-    release: paasta-mysql
+    release: pxc
     properties:
-      cf_mysql:
-        proxy:
-          port: ((proxy_mysql_port))
-          api_password: "((proxy_api_password))"
-    provides:
-      mysql-database:
-        as: mysql-database
-        shared: true
+      port: ((proxy_mysql_port))
+      api_password: ((cf_mysql_proxy_api_password))
+      api_port: 8083
 
 - name: mysql-broker
   instances: ((mysql_broker_instances))
@@ -103,6 +141,8 @@ instance_groups:
   - name: op-mysql-java-broker
     release: paasta-mysql
     properties:
+      database_type: mysql
+      mysql_admin_password: ((mysql_admin_password))
       log_dir: mysql-broker
       log_file: mysql-broker
       log_level: INFO
@@ -116,13 +156,43 @@ instance_groups:
             connection: ((mysql_broker_services_plan_b_connection))
 
 variables:
-- name: mysql_cluster_health_password
+- name: cf_mysql_mysql_admin_password
+  type: password
+- name: cf_mysql_proxy_api_password
   type: password
-- name: mysql_galera_healthcheck_endpoint_password
+- name: cf_mysql_mysql_galera_healthcheck_password
   type: password
-- name: mysql_galera_healthcheck_db_password
+- name: cf_mysql_mysql_galera_healthcheck_endpoint_password
   type: password
-- name: mysql_smoke_tests_db_password
-  type: password  
-- name: proxy_api_password
+- name: cf_mysql_mysql_cluster_health_password
   type: password
+- name: pxc_galera_ca
+  type: certificate
+  options:
+    common_name: pxc_galera_ca
+    is_ca: true
+- name: pxc_server_ca
+  type: certificate
+  options:
+    common_name: pxc_server_ca
+    is_ca: true
+- name: galera_server_certificate
+  type: certificate
+  update_mode: converge
+  options:
+    ca: pxc_galera_ca
+    common_name: galera_server_certificate
+    alternative_names:
+    - galera_server_certificate
+    extended_key_usage:
+    - server_auth
+    - client_auth
+- name: mysql_server_certificate
+  type: certificate
+  update_mode: converge
+  options:
+    ca: pxc_server_ca
+    common_name: sql-db.service.cf.internal
+    alternative_names:
+    - sql-db.service.cf.internal
+

mysql/operations/cce.yml

@@ -5,4 +5,47 @@
   path: /instance_groups/name=mysql-broker/jobs/name=op-mysql-java-broker/properties/cce_enable?
   value: true
 
+- type: replace
+  path: /releases/name=pxc?
+  value:
+    name: "pxc"
+    sha1: 7f90f2689f31ddcd95fe16c75a4e8816f2ec59db
+    url: https://nextcloud.paas-ta.org/index.php/s/cfGCLsgPz6iMcCE/download
+    version: 0.44.0-PaaS-TA-v2
+
+- type: replace
+  path: /instance_groups/name=mysql/jobs/-
+  value:
+    name: paasta_db_conf
+    release: paasta-conf
+    properties:
+      cce_enable: true
+
+- type: replace
+  path: /instance_groups/name=mysql/jobs/name=db_init_script/properties/init_sql?
+  value: |-
+    CREATE DATABASE IF NOT EXISTS broker;
+    USE broker;
+    CREATE TABLE IF NOT EXISTS `service_binding` (
+      `binding_id` varchar(100) NOT NULL DEFAULT '',
+      `instance_id` varchar(100) DEFAULT NULL,
+      `username` varchar(100) DEFAULT NULL,
+      `password` varchar(100) DEFAULT NULL,
+      `app_id` varchar(100) DEFAULT NULL,
+      PRIMARY KEY (`binding_id`)
+    ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
+    CREATE TABLE IF NOT EXISTS `service_instances` (
+      `instance_id` varchar(100) NOT NULL,
+      `service_id` varchar(100) NOT NULL,
+      `plan_id` varchar(100) NOT NULL,
+      `organization_guid` varchar(100) NOT NULL,
+      `space_guid` varchar(100) NOT NULL,
+      PRIMARY KEY (`instance_id`)
+    ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
+    GRANT ALL PRIVILEGES ON *.* TO 'root'@'localhost' IDENTIFIED with sha256_password BY '((mysql_admin_password))';
+    CREATE USER IF NOT EXISTS 'root'@'((proxy_static_ip))' IDENTIFIED with sha256_password BY '((mysql_admin_password))';
+    ALTER USER IF EXISTS 'root'@'((proxy_static_ip))' IDENTIFIED with sha256_password BY '((mysql_admin_password))';
+    GRANT ALL PRIVILEGES ON *.* TO 'root'@'((proxy_static_ip))' WITH GRANT OPTION;
+    flush privileges;

mysql/vars.yml

@@ -1,28 +1,23 @@
 # STEMCELL
 stemcell_os: "ubuntu-bionic"                                     # stemcell os
-stemcell_version: "1.92"                                       # stemcell version
+stemcell_version: "1.97"                                       # stemcell version
 
 # NETWORK
 private_networks_name: "default"                                 # private network name
 
 # MYSQL
 mysql_azs: [z4]                                                  # mysql azs
-mysql_instances: 1                                               # mysql instances (N)
+mysql_instances: 3                                               # mysql instances (N)
 mysql_vm_type: "small"                                           # mysql vm type
 mysql_persistent_disk_type: "8GB"                                # mysql persistent disk type
 mysql_port: 13306                                                # mysql port (e.g. 13306) -- Do Not Use "3306"
 mysql_admin_password: "<MYSQL_ADMIN_PASSWORD>"                   # mysql admin password (e.g. "admin!Service")
 
-# ARBITRATOR
-arbitrator_azs: [z4]                                             # arbitrator azs 
-arbitrator_instances: 1                                          # arbitrator instances (1)
-arbitrator_vm_type: "small"                                      # arbitrator vm type
-
 # PROXY
 proxy_azs: [z4]                                                  # proxy azs
-proxy_instances: 1                                               # proxy instances (1)
 proxy_vm_type: "small"                                           # proxy vm type
 proxy_mysql_port: 13307                                          # proxy mysql port (e.g. 13307) -- Do Not Use "3306"
+proxy_static_ip: "<PROXY_STATIC_IP>"                             # proxy ip (e.g. "10.0.161.100")
 
 # MYSQL_BROKER
 mysql_broker_azs: [z4]                                           # mysql broker azs

pinpoint/vars.yml

@@ -1,6 +1,6 @@
 # STEMCELL
 stemcell_os: "ubuntu-bionic"                                     # stemcell os
-stemcell_version: "1.92"                                       # stemcell version
+stemcell_version: "1.97"                                       # stemcell version
 
 # NETWORK
 private_networks_name: "default"                                 # private network name