Run same code on OpenStack AND Vagrant

apache/init.sls

@@ -0,0 +1,3 @@
+apache.server-status:
+  default:
+    url: http://localhost/server-status

backup/init.sls

@@ -0,0 +1 @@
+backup_days: 7

backup/master.sls

@@ -0,0 +1 @@
+backup_days: 28

basesystem/auth.sls

@@ -0,0 +1,15 @@
+basesystem:
+  auth:
+    unpacker_archives:
+      /srv/webplatform/auth-server/content:
+        href: https://static.webplatform.org/wpd/packages/fxa/fxa-content-server-dist.tar.gz
+        user: webapps
+      /srv/webplatform/auth-server/auth:
+        href: https://static.webplatform.org/wpd/packages/fxa/fxa-auth-server-dist.tar.gz
+        user: webapps
+      /srv/webplatform/auth-server/oauth:
+        href: https://static.webplatform.org/wpd/packages/fxa/fxa-oauth-server-dist.tar.gz
+        user: webapps
+      /srv/webplatform/auth-server/profile:
+        href: https://static.webplatform.org/wpd/packages/fxa/fxa-profile-server-dist.tar.gz
+        user: webapps

basesystem/docker.sls

@@ -0,0 +1,7 @@
+basesystem:
+  docker:
+    discuss:
+      git_clone:
+        /srv/webapps/discuss:
+          origin: https://github.com/discourse/discourse_docker.git
+          user: webapps

basesystem/notes.sls

@@ -0,0 +1,8 @@
+basesystem:
+  notes:
+    unpacker_archives:
+      /opt/pypy:
+        href: https://static.webplatform.org/wpd/packages/python/pypy-2.5.1-linux64.tar.bz2
+      /srv/webplatform/notes-server:
+        href: https://static.webplatform.org/wpd/packages/hypothesis/notes-server-201412.tar.bz2
+        user: webapps

basesystem/stats.sls

@@ -0,0 +1,6 @@
+basesystem:
+  stats:
+    unpacker_archives:
+      /srv/webplatform/stats-server:
+        href: https://static.webplatform.org/wpd/packages/piwik/piwik.zip
+        user: app-user

bots/init.sls

@@ -0,0 +1,10 @@
+bots:
+  logger:
+{% if grains['level'] == 'production' %}
+    nickname: wp-logger
+    channel: webplatform
+{% else %}
+    nickname: wp-logger2
+    channel: webplatform-bot
+{% endif %}
+

elasticsearch/logstash.sls

@@ -0,0 +1,7 @@
+elasticsearch:
+  master: noc.webplatform.org
+  bind: noc.webplatform.org
+#  heap_size:
+#  min_discovery: 0
+#  peer_discovery_enabled: false
+#  write_consistency: quorom

glusterfs/volumes.sls

@@ -0,0 +1,2 @@
+volume_auth_allow: {'wiki-images': "10.10.10.9"}
+# Go see in pillar/infra

infra/init.sls

@@ -0,0 +1,2 @@
+include:
+  - infra.{{ grains['level'] }}

infra/production.sls

@@ -0,0 +1,124 @@
+infra:
+
+
+  current:
+    tld: webplatform.org
+
+  notes-server:
+    port: 8001
+    public_url: https://notes.webplatform.org
+    ## Make sure it matches infra:elasticsearch
+    elastic_endpoint: http://10.10.10.103:9200
+    sender_email: notifier-notes@webplatform.org
+
+  auth-server:
+    auth:
+      host: 10.10.10.189
+      port: 9000
+    profile:
+      host: 10.10.10.189
+      port: 8081
+    oauth:
+      host: 10.10.10.189
+      port: 9010
+    content:
+      host: 10.10.10.189
+      port: 3030
+    endpoints:
+      auth: https://oauth.accounts.webplatform.org/v1/authorization
+      token: https://oauth.accounts.webplatform.org/v1/token
+      session: https://profile.accounts.webplatform.org/v1/session
+      session_read: https://profile.accounts.webplatform.org/v1/session/read
+      session_recover: https://profile.accounts.webplatform.org/v1/session/recover
+
+  gdnsd_timestamp: 2015052200
+
+  # Host names we want to override public name (e.g. api.accounts.webplatform.org)
+  # into using its private IP address.
+  # Most important keys: api.accounts, oauth.accounts, profile.accounts
+  hardcoded_entries:
+    api.accounts: 10.10.10.189
+    oauth.accounts: 10.10.10.189
+    profile.accounts: 10.10.10.189
+
+  # In use for each node /etc/hosts and entries will be
+  # refered to as "foo.local.wpdn"
+  # Most important keys: salt, mail, monitor, backup
+  hosts_entries:
+    salt: 10.10.10.41
+    masterdb: 10.10.10.74
+    mail: 10.10.10.112
+    backup: 10.10.10.101
+    source: 10.10.10.40
+    specs: 10.10.10.201
+
+  db_servers:
+    postgres:
+      writes: 10.10.10.194
+    mysql:
+      writes: 10.10.10.74
+#      slaves:
+#        - 10.10.10.74
+
+  ## Ensure it matches notes:elastic_endpoint
+  ## infra:elasticsearch:backup_nfs_mountpoint MUST match at pillar nfs:server:exports for ElasticSearch
+  elasticsearch:
+    backup_nfs_mountpoint: /srv/exports/elasticsearch
+    backup_owner_uid: 107
+    backup_owner_gid: 112
+    private: 10.10.10.100
+    port: 9200
+    nodes-wiki:
+      - 10.10.10.110
+    nodes:
+      - 10.10.10.100
+      - 10.10.10.103
+
+  ## MUST be strings, e.g. '10.10.10.1:11211'!
+  sessions_memcache:
+    - '10.10.10.139:11211'
+    - '10.10.10.140:11211'
+    - '10.10.10.115:11211'
+
+  ## MUST be strings, e.g. '10.10.10.1:6379'!
+  sessions_redis:
+    - '10.10.10.139:6379'
+    - '10.10.10.140:6379'
+    - '10.10.10.115:6379'
+
+  ## MUST be strings, e.g. '10.10.10.1:6379'!
+  alpha_redis:
+    - '10.10.10.63:6379'
+    - '10.10.10.114:6379'
+
+  ## MUST be strings, e.g. '10.10.10.1:11211'!
+  alpha_memcache:
+    - '10.10.10.64:11211'
+    - '10.10.10.65:11211'
+    - '10.10.10.113:11211'
+
+  public_ips:
+    salt:
+      - 173.236.254.95
+    app:
+      - 173.236.255.110
+      - 173.236.255.111
+      - 173.236.255.112
+    mail:
+      - 173.236.254.98
+      - 173.236.254.99
+    bots:
+      - 173.236.254.100
+    blog:
+      - 173.236.255.117
+    project:
+      - 173.236.255.116
+    notes:
+      - 173.236.254.96
+    frontends:
+      - 173.236.255.115
+      - 173.236.255.113
+    rsync.specs:
+      - 67.205.62.137
+
+# 208.113.157.138

infra/staging.sls

@@ -0,0 +1,110 @@
+infra:
+#  salt_testing: True
+
+  current:
+    tld: webplatformstaging.org
+
+  notes-server:
+    port: 8001
+    public_url: https://notes.webplatformstaging.org
+    ## Make sure it matches infra:elasticsearch
+    elastic_endpoint: http://10.10.10.19:9200
+    sender_email: notifier-notes@webplatformstaging.org
+
+  auth-server:
+    auth:
+      host: 10.10.10.7
+      port: 9000
+    profile:
+      host: 10.10.10.7
+      port: 8081
+    oauth:
+      host: 10.10.10.7
+      port: 9010
+    content:
+      host: 10.10.10.7
+      port: 3030
+    endpoints:
+      auth: https://oauth.accounts.webplatformstaging.org/v1/authorization
+      token: https://oauth.accounts.webplatformstaging.org/v1/token
+      session: https://profile.accounts.webplatformstaging.org/v1/session
+      session_read: https://profile.accounts.webplatformstaging.org/v1/session/read
+      session_recover: https://profile.accounts.webplatformstaging.org/v1/session/recover
+
+  gdnsd_timestamp: 2015060104
+
+  # Host names we want to override public name (e.g. api.accounts.webplatform.org)
+  # into using its private IP address.
+  # Most important keys: api.accounts, oauth.accounts, profile.accounts
+  hardcoded_entries:
+    api.accounts: 10.10.10.7
+    oauth.accounts: 10.10.10.7
+    profile.accounts: 10.10.10.7
+
+  # In use for each node /etc/hosts and entries will be
+  # refered to as "foo.local.wpdn"
+  # Most important keys: salt, mail, monitor, backup
+  hosts_entries:
+    salt: 10.10.10.244
+    mail: 10.10.10.180
+    backup: 10.10.10.18
+
+  db_servers:
+    postgres:
+      writes: 10.10.10.21
+    mysql:
+      writes: 10.10.10.6
+
+  ## Ensure it matches notes:elastic_endpoint
+  ## infra:elasticsearch:backup_nfs_mountpoint MUST match at pillar nfs:server:exports for ElasticSearch
+  elasticsearch:
+    backup_nfs_mountpoint: /srv/exports/elasticsearch
+    backup_owner_uid: 107
+    backup_owner_gid: 112
+    private: 10.10.10.19
+    port: 9200
+    nodes-wiki:
+      - 10.10.10.8
+    nodes:
+      - 10.10.10.19
+      - 10.10.10.20
+
+  ## MUST be strings, e.g. '10.10.10.1:11211'!
+  sessions_memcache:
+    - '10.10.10.5:11211'
+
+  ## MUST be strings, e.g. '10.10.10.1:6379'!
+  sessions_redis:
+    - '10.10.10.5:6379'
+
+  ## MUST be strings, e.g. '10.10.10.1:6379'!
+  alpha_redis:
+    - '10.10.10.252:6379'
+
+  ## MUST be strings, e.g. '10.10.10.1:11211'!
+  alpha_memcache:
+    - '10.10.10.251:11211'
+
+  public_ips:
+    piwik:
+      - 173.236.254.222
+    app:
+      - 173.236.254.223
+      - 173.236.254.224
+      - 173.236.254.225
+    blog:
+      - 173.236.254.226
+    project:
+      - 173.236.254.227
+    salt:
+      - 173.236.254.239
+    mail:
+      - 173.236.254.235
+      - 173.236.254.236
+    bots:
+      - 173.236.254.237
+    notes:
+      - 173.236.254.228
+    accounts:
+      - 173.236.255.186
+