Merge pull request #494 from edx/feanil/stage

Feanil/stage

cloudformation_templates/edx-reference-architecture.json

@@ -2589,8 +2589,12 @@
         "LaunchConfigurationName":{
           "Ref":"EdxappServer"
         },
-        "MinSize":"2",
-        "MaxSize":"2",
+        "MinSize":{
+          "Ref":"EdxappDesiredCapacity"
+        },
+        "MaxSize":{
+          "Ref":"EdxappDesiredCapacity"
+        },
         "DesiredCapacity":{
           "Ref":"EdxappDesiredCapacity"
         },
@@ -2936,8 +2940,12 @@
         "LaunchConfigurationName":{
           "Ref":"XqueueServer"
         },
-        "MinSize":"2",
-        "MaxSize":"2",
+        "MinSize":{
+          "Ref":"XqueueDesiredCapacity"
+        },
+        "MaxSize":{
+          "Ref":"XqueueDesiredCapacity"
+        },
         "DesiredCapacity":{
           "Ref":"XqueueDesiredCapacity"
         },
@@ -3266,8 +3274,12 @@
         "LaunchConfigurationName":{
           "Ref":"RabbitMQServer"
         },
-        "MinSize":"2",
-        "MaxSize":"2",
+        "MinSize":{
+          "Ref":"RabbitMQDesiredCapacity"
+        },
+        "MaxSize":{
+          "Ref":"RabbitMQDesiredCapacity"
+        },
         "DesiredCapacity":{
           "Ref":"RabbitMQDesiredCapacity"
         },
@@ -3632,8 +3644,12 @@
         "LaunchConfigurationName":{
           "Ref":"XServer"
         },
-        "MinSize":"2",
-        "MaxSize":"2",
+        "MinSize":{
+          "Ref":"XServerDesiredCapacity"
+        },
+        "MaxSize":{
+          "Ref":"XServerDesiredCapacity"
+        },
         "DesiredCapacity":{
           "Ref":"XServerDesiredCapacity"
         },
@@ -4091,8 +4107,12 @@
         "LaunchConfigurationName":{
           "Ref":"WorkerServer"
         },
-        "MinSize":"2",
-        "MaxSize":"2",
+        "MinSize":{
+          "Ref":"WorkerDesiredCapacity"
+        },
+        "MaxSize":{
+          "Ref":"WorkerDesiredCapacity"
+        },
         "DesiredCapacity":{
           "Ref":"WorkerDesiredCapacity"
         }
@@ -4336,8 +4356,12 @@
         "LaunchConfigurationName":{
           "Ref":"ForumServer"
         },
-        "MinSize":"2",
-        "MaxSize":"2",
+        "MinSize":{
+          "Ref":"ForumDesiredCapacity"
+        },
+        "MaxSize":{
+          "Ref":"ForumDesiredCapacity"
+        },
         "DesiredCapacity":{
           "Ref":"ForumDesiredCapacity"
         },
@@ -4728,8 +4752,12 @@
         "LaunchConfigurationName":{
           "Ref":"MongoServer"
         },
-        "MinSize":"3",
-        "MaxSize":"3",
+        "MinSize":{
+          "Ref":"MongoDesiredCapacity"
+        },
+        "MaxSize":{
+          "Ref":"MongoDesiredCapacity"
+        },
         "DesiredCapacity":{
           "Ref":"MongoDesiredCapacity"
         }

playbooks/edx-east/edx_vpc.yml

@@ -36,7 +36,7 @@
       - lms-preview
     - role: 'edxapp'
       edxapp_lms_env: 'lms.envs.load_test'
-      migrate_db: 'yes'
+      migrate_db: '{{ RUN_EDXAPP_MIGRATION }}'
       openid_workaround: 'yes'
     - splunkforwarder
 - hosts: tag_role_edxapp:!first_in_tag_role_edxapp
@@ -116,7 +116,7 @@
       nginx_sites:
       - xqueue
     - role: xqueue
-      migrate_db: 'yes'
+      migrate_db: '{{ RUN_XQUEUE_MIGRATION }}'
     - splunkforwarder
 - hosts: tag_role_xqueue:!first_in_tag_role_xqueue
   sudo: True