improves the screwdriver cookbook.

[metasearch/grid-chef-repo.git] / cookbooks / screwdriver / recipes / docker-compose.rb

diff --git a/cookbooks/screwdriver/recipes/docker-compose.rb b/cookbooks/screwdriver/recipes/docker-compose.rb
index 4450a20..9566dd6 100644 (file)
--- a/cookbooks/screwdriver/recipes/docker-compose.rb
+++ b/cookbooks/screwdriver/recipes/docker-compose.rb
@@ -100,6 +100,7 @@ force_override_config_srvs = node.force_override['screwdriver']['docker-compose'
 api_envs_org = config_srvs['api']['environment']
 api_envs = {}
 api_vols = config_srvs['api']['volumes'].to_a
+api_links = []
 
 api_port = '9001'  # default
 api_in_port = api_envs_org['PORT']
@@ -253,7 +254,7 @@ when 'sqlite'
   api_vols.push("#{data_dir}:/sd-data:rw")
   api_envs['DATASTORE_SEQUELIZE_STORAGE'] = '/sd-data/storage.db'
 when 'mysql', 'postgres'
-  override_config_srvs['api']['links'] = ['db']
+  api_links.push('db')
   api_envs['DATASTORE_SEQUELIZE_HOST'] = 'db'
 end
 
@@ -295,6 +296,23 @@ if db_dialect != 'sqlite'
   end
 end
 
+# queue
+executor_queue_enabled = api_envs_org['EXECUTOR_QUEUE_ENABLED'] == 'true' ? true : false
+if executor_queue_enabled
+  queue_envs = {}
+  queue_vols = config_srvs['queue']['volumes'].to_a
+
+  api_links.push('queue')
+  api_envs['QUEUE_REDIS_HOST'] = 'queue'
+  # TODO: set up env. vars.
+  # QUEUE_REDIS_PORT
+  # QUEUE_REDIS_PASSWORD
+  # QUEUE_REDIS_TLS_ENABLED
+  # QUEUE_REDIS_DATABASE
+end
+
+override_config_srvs['api']['links'] = api_links unless api_links.empty?
+
 # ui
 #ui_envs_org = config_srvs['ui']['environment']
 ui_envs = {}
@@ -317,6 +335,7 @@ store_backend = node['screwdriver']['store']['backend']
 store_envs_org = config_srvs['store']['environment']
 store_envs = {}
 store_vols = config_srvs['store']['volumes'].to_a
+store_links = []
 
 store_port = '9002'  # default
 store_in_port = store_envs_org['PORT']
@@ -346,7 +365,7 @@ store_envs['S3_ACCESS_KEY_SECRET'] = '${S3_ACCESS_KEY_SECRET}'
 
 # S3 compatible server
 if !store_backend.nil? && !store_backend.empty?
-  override_config_srvs['store']['links'] = ['screwdriver.s3']
+  store_links.push('screwdriver.s3')
   store_envs['STRATEGY'] = 's3'
   store_envs['S3_BUCKET'] = 'screwdriver'
 
@@ -387,6 +406,8 @@ if !store_backend.nil? && !store_backend.empty?
   end
 end
 
+override_config_srvs['store']['links'] = store_links unless store_links.empty?
+
 override_store_config['auth']['jwtPublicKey'] = jwt_public_key
 # Note: prevent Chef from logging JWT key attribute value. (=> template variables)
 # However Docker env file format does not support multi-line value and backslash escaped string yet.
@@ -526,24 +547,23 @@ end
   srv_vols.push("#{local_yaml_file}:/config/local.yaml:ro")
 }
 
-# merge environment hash
+# merge environment hash and reset volumes array.
 force_override_config_srvs['api']['environment'] = api_envs unless api_envs.empty?
-force_override_config_srvs['ui']['environment'] = ui_envs unless ui_envs.empty?
-force_override_config_srvs['store']['environment'] = store_envs unless store_envs.empty?
-if db_dialect != 'sqlite'
-  force_override_config_srvs['db']['environment'] = db_envs unless db_envs.empty?
-end
-if !store_backend.nil? && !store_backend.empty?
-  force_override_config_srvs['screwdriver.s3']['environment'] = s3_envs unless s3_envs.empty?
-end
-# reset vlumes array.
 override_config_srvs['api']['volumes'] = api_vols unless api_vols.empty?
+force_override_config_srvs['ui']['environment'] = ui_envs unless ui_envs.empty?
 override_config_srvs['ui']['volumes'] = ui_vols unless ui_vols.empty?
+force_override_config_srvs['store']['environment'] = store_envs unless store_envs.empty?
 override_config_srvs['store']['volumes'] = store_vols unless store_vols.empty?
 if db_dialect != 'sqlite'
+  force_override_config_srvs['db']['environment'] = db_envs unless db_envs.empty?
   override_config_srvs['db']['volumes'] = db_vols unless db_vols.empty?
 end
+if executor_queue_enabled
+  force_override_config_srvs['queue']['environment'] = queue_envs unless queue_envs.empty?
+  override_config_srvs['queue']['volumes'] = queue_vols unless queue_vols.empty?
+end
 if !store_backend.nil? && !store_backend.empty?
+  force_override_config_srvs['screwdriver.s3']['environment'] = s3_envs unless s3_envs.empty?
   override_config_srvs['screwdriver.s3']['volumes'] = s3_vols unless s3_vols.empty?
 end