update management bits

diff --git a/group_vars/management b/group_vars/management
index 98a2263ffdffc9fcb31ed798b3ac2f1a75fa90ce..ed97d539c095cf1413af30cc23dea272095b97dd 100644 (file)
--- a/group_vars/management
+++ b/group_vars/management
@@ -1,6 +1 @@
-MANAGEMENT_DATA_ROOT: /data/management
-MANAGEMENT_EVENT_QUEUE: management-events
-MANAGEMENT_EVENT_FAILURE_QUEUE: management-events-failed
-MANAGEMENT_NOTICE_ARN: arn:aws:sns:us-east-1:123456789012:management-alerts
-MANAGEMENT_BACKUP_S3_BUCKET: backups
-MANAGEMENT_SUBNET: "subnet-1234abcd"
+---

diff --git a/init_management.yml b/init_management.yml
new file mode 100644 (file)
index 0000000..97302ba
--- /dev/null
+++ b/init_management.yml
@@ -0,0 +1,7 @@
+---
+- hosts: localhost
+  connection: local
+  gather_facts: False
+  become: no
+  roles:
+  - aws-management-infrastructure

diff --git a/init_vpc.yml b/init_vpc.yml
new file mode 100644 (file)
index 0000000..ad7f39a
--- /dev/null
+++ b/init_vpc.yml
@@ -0,0 +1,7 @@
+---
+- hosts: localhost
+  connection: local
+  gather_facts: False
+  become: no
+  roles:
+  - aws-vpc-infrastructure

diff --git a/management.yml b/management.yml
index 912a6738bdeb6eb371ae6400ff07fd2685d29b3c..a6ce26a434eea1579740489e922b879a5ee052a4 100644 (file)
--- a/management.yml
+++ b/management.yml
@@ -3,4 +3,4 @@
   become: true
   roles:
   - common
-#  - management
+  - management

diff --git a/roles/management/defaults/main.yml b/roles/management/defaults/main.yml
new file mode 100644 (file)
index 0000000..6538c24
--- /dev/null
+++ b/roles/management/defaults/main.yml
@@ -0,0 +1,2 @@
+---
+MANAGEMENT_DATA_ROOT: /data/management

diff --git a/roles/management/meta/main.yml b/roles/management/meta/main.yml
new file mode 100644 (file)
index 0000000..f4f0c2a
--- /dev/null
+++ b/roles/management/meta/main.yml
@@ -0,0 +1,3 @@
+---
+dependencies:
+  - { role: aws-management-queues }

diff --git a/roles/management/templates/sqs-poll.cron.j2 b/roles/management/templates/sqs-poll.cron.j2
index 98a4b1fa84f6bb89da177a097030124f50ac26c9..872c7bae0ac029fd8b3ff995291033fe93ad16a5 100644 (file)
--- a/roles/management/templates/sqs-poll.cron.j2
+++ b/roles/management/templates/sqs-poll.cron.j2
@@ -1 +1 @@
-* * * * * ec2-user {{ MANAGEMENT_DATA_ROOT }}/sqs-action.py {{ MANAGEMENT_DATA_ROOT }} {{ MANAGEMENT_EVENT_QUEUE }} {{ MANAGEMENT_NOTICE_ARN }}
+* * * * * ec2-user {{ MANAGEMENT_DATA_ROOT }}/sqs-action.py {{ MANAGEMENT_DATA_ROOT }} {{ MANAGEMENT_EVENT_QUEUE }} {{ management_notice_topic.sns_arn }}