Change order of recipes for execute gitlab before colab into integration_server

Signed-off-by: Lucas Moura <lucas.moura128@gmail.com> Signed-off-by: Luciano Prestes Cavalcanti <lucianopcbr@gmail.com>

Change order of recipes for execute gitlab before colab into integration_server
Signed-off-by: Lucas Moura <lucas.moura128@gmail.com> Signed-off-by: Luciano Prestes Cavalcanti <lucianopcbr@gmail.com>
Luciano Prestes
1 parent 1cf7f36a
Showing 2 changed files with 5 additions and 5 deletions Show diff stats
cookbooks/colab/recipes/default.rb
roles/integration_server.rb
@@ -53,7 +53,7 @@ template &#39;/etc/colab/settings.d/00-database.yaml&#39; do
   notifies :restart, 'service[colab]'
 end
-execute 'create token-admin' do
+execute 'create-admin-token-colab' do
   user = "admin-gitlab"
   email = "admin-gitlab@admin.com"
   password = SecureRandom.random_number.to_s
@@ -61,15 +61,15 @@ execute &#39;create token-admin&#39; do
   command "echo \"from colab.accounts.models import User; User.objects.create_superuser(\'#{user}\', \'#{email}\', \'#{password}\')\" | colab-admin shell"
 end
-execute 'admin-token' do
+execute 'create-admin-token-gitlab' do
   user = "admin-gitlab"
   email = "admin-gitlab@admin.com"
   password = SecureRandom.random_number.to_s
-  command "sudo -u git RAILS_ENV=production bundle exec rails runner \"User.create(name: #{name}, username: #{name}, email: #{email}, password: #{password}, admin: true)\""
+  command "RAILS_ENV=production bundle exec rails runner \"User.create(name: #{name}, username: #{name}, email: #{email}, password: #{password}, admin: true)\""
   cwd '/usr/lib/gitlab'
-  user 'root'
+  user 'git'
 end
 template '/etc/colab/settings.d/01-apps.yaml' do
@@ -8,8 +8,8 @@ run_list *[
   'recipe[mailman-api]',
   'recipe[mailman]',
   'recipe[mailman::webui]',
+  'recipe[gitlab]',
   'recipe[colab]',
   'recipe[colab::nginx]',
-  'recipe[gitlab]',
   'recipe[backup]',
 ]
	@@ -53,7 +53,7 @@ template '/etc/colab/settings.d/00-database.yaml' do		@@ -53,7 +53,7 @@ template '/etc/colab/settings.d/00-database.yaml' do
53	notifies :restart, 'service[colab]'	53	notifies :restart, 'service[colab]'
54	end	54	end
55		55
56	-execute 'create token-admin' do	56	+execute 'create-admin-token-colab' do
57	user = "admin-gitlab"	57	user = "admin-gitlab"
58	email = "admin-gitlab@admin.com"	58	email = "admin-gitlab@admin.com"
59	password = SecureRandom.random_number.to_s	59	password = SecureRandom.random_number.to_s
	@@ -61,15 +61,15 @@ execute 'create token-admin' do		@@ -61,15 +61,15 @@ execute 'create token-admin' do
61	command "echo \"from colab.accounts.models import User; User.objects.create_superuser(\'#{user}\', \'#{email}\', \'#{password}\')\" \| colab-admin shell"	61	command "echo \"from colab.accounts.models import User; User.objects.create_superuser(\'#{user}\', \'#{email}\', \'#{password}\')\" \| colab-admin shell"
62	end	62	end
63		63
64	-execute 'admin-token' do	64	+execute 'create-admin-token-gitlab' do
65	user = "admin-gitlab"	65	user = "admin-gitlab"
66	email = "admin-gitlab@admin.com"	66	email = "admin-gitlab@admin.com"
67	password = SecureRandom.random_number.to_s	67	password = SecureRandom.random_number.to_s
68		68
69	- command "sudo -u git RAILS_ENV=production bundle exec rails runner \"User.create(name: #{name}, username: #{name}, email: #{email}, password: #{password}, admin: true)\""	69	+ command "RAILS_ENV=production bundle exec rails runner \"User.create(name: #{name}, username: #{name}, email: #{email}, password: #{password}, admin: true)\""
70		70
71	cwd '/usr/lib/gitlab'	71	cwd '/usr/lib/gitlab'
72	- user 'root'	72	+ user 'git'
73	end	73	end
74		74
75	template '/etc/colab/settings.d/01-apps.yaml' do	75	template '/etc/colab/settings.d/01-apps.yaml' do