Skip to content

C
configuration
Commit 682b09f3 by Feanil Patel
Options

Merge pull request #494 from edx/feanil/stage 

Feanil/stage
parents d1e31e71 f53a6d78
Showing with 44 additions and 16 deletions
cloudformation_templates/edx-reference-architecture.json
...@@ -2589,8 +2589,12 @@ ...@@ -2589,8 +2589,12 @@
"LaunchConfigurationName":{ "LaunchConfigurationName":{
"Ref":"EdxappServer" "Ref":"EdxappServer"
}, },
"MinSize":"2", "MinSize":{
"MaxSize":"2", "Ref":"EdxappDesiredCapacity"
},
"MaxSize":{
"Ref":"EdxappDesiredCapacity"
},
"DesiredCapacity":{ "DesiredCapacity":{
"Ref":"EdxappDesiredCapacity" "Ref":"EdxappDesiredCapacity"
}, },
...@@ -2936,8 +2940,12 @@ ...@@ -2936,8 +2940,12 @@
"LaunchConfigurationName":{ "LaunchConfigurationName":{
"Ref":"XqueueServer" "Ref":"XqueueServer"
}, },
"MinSize":"2", "MinSize":{
"MaxSize":"2", "Ref":"XqueueDesiredCapacity"
},
"MaxSize":{
"Ref":"XqueueDesiredCapacity"
},
"DesiredCapacity":{ "DesiredCapacity":{
"Ref":"XqueueDesiredCapacity" "Ref":"XqueueDesiredCapacity"
}, },
...@@ -3266,8 +3274,12 @@ ...@@ -3266,8 +3274,12 @@
"LaunchConfigurationName":{ "LaunchConfigurationName":{
"Ref":"RabbitMQServer" "Ref":"RabbitMQServer"
}, },
"MinSize":"2", "MinSize":{
"MaxSize":"2", "Ref":"RabbitMQDesiredCapacity"
},
"MaxSize":{
"Ref":"RabbitMQDesiredCapacity"
},
"DesiredCapacity":{ "DesiredCapacity":{
"Ref":"RabbitMQDesiredCapacity" "Ref":"RabbitMQDesiredCapacity"
}, },
...@@ -3632,8 +3644,12 @@ ...@@ -3632,8 +3644,12 @@
"LaunchConfigurationName":{ "LaunchConfigurationName":{
"Ref":"XServer" "Ref":"XServer"
}, },
"MinSize":"2", "MinSize":{
"MaxSize":"2", "Ref":"XServerDesiredCapacity"
},
"MaxSize":{
"Ref":"XServerDesiredCapacity"
},
"DesiredCapacity":{ "DesiredCapacity":{
"Ref":"XServerDesiredCapacity" "Ref":"XServerDesiredCapacity"
}, },
...@@ -4091,8 +4107,12 @@ ...@@ -4091,8 +4107,12 @@
"LaunchConfigurationName":{ "LaunchConfigurationName":{
"Ref":"WorkerServer" "Ref":"WorkerServer"
}, },
"MinSize":"2", "MinSize":{
"MaxSize":"2", "Ref":"WorkerDesiredCapacity"
},
"MaxSize":{
"Ref":"WorkerDesiredCapacity"
},
"DesiredCapacity":{ "DesiredCapacity":{
"Ref":"WorkerDesiredCapacity" "Ref":"WorkerDesiredCapacity"
} }
...@@ -4336,8 +4356,12 @@ ...@@ -4336,8 +4356,12 @@
"LaunchConfigurationName":{ "LaunchConfigurationName":{
"Ref":"ForumServer" "Ref":"ForumServer"
}, },
"MinSize":"2", "MinSize":{
"MaxSize":"2", "Ref":"ForumDesiredCapacity"
},
"MaxSize":{
"Ref":"ForumDesiredCapacity"
},
"DesiredCapacity":{ "DesiredCapacity":{
"Ref":"ForumDesiredCapacity" "Ref":"ForumDesiredCapacity"
}, },
...@@ -4728,8 +4752,12 @@ ...@@ -4728,8 +4752,12 @@
"LaunchConfigurationName":{ "LaunchConfigurationName":{
"Ref":"MongoServer" "Ref":"MongoServer"
}, },
"MinSize":"3", "MinSize":{
"MaxSize":"3", "Ref":"MongoDesiredCapacity"
},
"MaxSize":{
"Ref":"MongoDesiredCapacity"
},
"DesiredCapacity":{ "DesiredCapacity":{
"Ref":"MongoDesiredCapacity" "Ref":"MongoDesiredCapacity"
} }
......
playbooks/edx-east/edx_vpc.yml
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
- lms-preview - lms-preview
- role: 'edxapp' - role: 'edxapp'
edxapp_lms_env: 'lms.envs.load_test' edxapp_lms_env: 'lms.envs.load_test'
migrate_db: 'yes' migrate_db: '{{ RUN_EDXAPP_MIGRATION }}'
openid_workaround: 'yes' openid_workaround: 'yes'
- splunkforwarder - splunkforwarder
- hosts: tag_role_edxapp:!first_in_tag_role_edxapp - hosts: tag_role_edxapp:!first_in_tag_role_edxapp
...@@ -116,7 +116,7 @@ ...@@ -116,7 +116,7 @@
nginx_sites: nginx_sites:
- xqueue - xqueue
- role: xqueue - role: xqueue
migrate_db: 'yes' migrate_db: '{{ RUN_XQUEUE_MIGRATION }}'
- splunkforwarder - splunkforwarder
- hosts: tag_role_xqueue:!first_in_tag_role_xqueue - hosts: tag_role_xqueue:!first_in_tag_role_xqueue
sudo: True sudo: True
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment