cleaned up tags to make them more consistent between playbooks
diff --git a/installations/baas/components/opdk-install-component.yml b/installations/baas/components/opdk-install-component.yml
index 724c01b..6e9a51a 100644
--- a/installations/baas/components/opdk-install-component.yml
+++ b/installations/baas/components/opdk-install-component.yml
@@ -5,12 +5,24 @@
- ~/.apigee/credentials.yml
roles:
- opdk-setup-apigee-user
+ tags:
+ - user
+
+- hosts: '{{ hosts }}'
+ strategy: free
+ vars_files:
+ - ~/.apigee/credentials.yml
+ roles:
- opdk-setup-os-limits
+ tags:
+ - os
- hosts: '{{ hosts }}'
strategy: free
roles:
- opdk-setup-openjdk
+ tags:
+ - openjdk
- hosts: '{{ hosts }}'
strategy: free
@@ -18,6 +30,8 @@
- ~/.apigee/credentials.yml
roles:
- opdk-setup-bootstrap
+ tags:
+ - bootstrap
- hosts: '{{ hosts }}'
strategy: free
@@ -26,8 +40,12 @@
roles:
- opdk-setup-silent-installation-config
- opdk-setup-component-installer
+ tags:
+ - installer
- hosts: '{{ hosts }}'
serial: 1
roles:
- { role: opdk-setup-component, profile: '{{ component_profile }}' }
+ tags:
+ - component
diff --git a/installations/dc1/components/opdk-install-component.yml b/installations/dc1/components/opdk-install-component.yml
index 98b7d7f..97eed97 100644
--- a/installations/dc1/components/opdk-install-component.yml
+++ b/installations/dc1/components/opdk-install-component.yml
@@ -5,12 +5,24 @@
- ~/.apigee/credentials.yml
roles:
- opdk-setup-apigee-user
+ tags:
+ - user
+
+- hosts: '{{ hosts }}'
+ strategy: free
+ vars_files:
+ - ~/.apigee/credentials.yml
+ roles:
- opdk-setup-os-limits
+ tags:
+ - os
- hosts: '{{ hosts }}'
strategy: free
roles:
- opdk-setup-openjdk
+ tags:
+ - openjdk
- hosts: '{{ hosts }}'
strategy: free
@@ -18,6 +30,8 @@
- ~/.apigee/credentials.yml
roles:
- opdk-setup-bootstrap
+ tags:
+ - bootstrap
- hosts: '{{ hosts }}'
strategy: free
@@ -26,79 +40,13 @@
roles:
- opdk-setup-silent-installation-config
- opdk-setup-component-installer
+ tags:
+ - installer
- hosts: '{{ hosts }}'
serial: 1
- pre_tasks:
- - name: Check for router server self report
- ignore_errors: yes
- opdk_server_self:
- server_type: 'router'
- username: '{{ opdk_user_email }}'
- password: '{{ opdk_user_pass }}'
-
- - name: Check for message processor server self report
- ignore_errors: yes
- opdk_server_self:
- server_type: 'mp'
- username: '{{ opdk_user_email }}'
- password: '{{ opdk_user_pass }}'
-
- - name: Set uuid if router
- set_fact:
- uuid: '{{ edge_router_self.uUID }}'
- when: edge_router_self is defined
-
- - name: Set uuid if message processor
- set_fact:
- uuid: '{{ edge_mp_self.uUID }}'
- when: edge_mp_self is defined
-
- - name: Set reachability to false if set
- ignore_errors: yes
- uri:
- user: '{{ opdk_user_email }}'
- password: '{{ opdk_user_pass }}'
- method: POST
- url: http://{{ local_mgmt_ip }}:{{ ms_ext_mgmt_port }}/v1/servers/{{ uuid }}
- body: reachable=false
- when: uuid is defined
-
roles:
- { role: opdk-setup-component, profile: '{{ component_profile }}' }
-
- tasks:
- - name: Check for router server self report
- ignore_errors: yes
- opdk_server_self:
- server_type: 'router'
- username: '{{ opdk_user_email }}'
- password: '{{ opdk_user_pass }}'
-
- - name: Check for message processor server self report
- ignore_errors: yes
- opdk_server_self:
- server_type: 'mp'
- username: '{{ opdk_user_email }}'
- password: '{{ opdk_user_pass }}'
-
- - name: Set uuid if router
- set_fact:
- uuid: '{{ edge_router_self.uUID }}'
- when: edge_router_self is defined
-
- - name: Set uuid if message processor
- set_fact:
- uuid: '{{ edge_mp_self.uUID }}'
- when: edge_mp_self is defined
-
- - name: Set reachability to true if changed
- ignore_errors: yes
- uri:
- user: '{{ opdk_user_email }}'
- password: '{{ opdk_user_pass }}'
- method: POST
- url: http://{{ local_mgmt_ip }}:{{ ms_ext_mgmt_port }}/v1/servers/{{ uuid }}
- body: reachable=true
- when: uuid is defined
+ tags:
+ - component
diff --git a/installations/monetization/components/opdk-install-component.yml b/installations/monetization/components/opdk-install-component.yml
index 14762ff..339ed85 100644
--- a/installations/monetization/components/opdk-install-component.yml
+++ b/installations/monetization/components/opdk-install-component.yml
@@ -5,12 +5,24 @@
- ~/.apigee/credentials.yml
roles:
- opdk-setup-apigee-user
+ tags:
+ - user
+
+- hosts: '{{ hosts }}'
+ strategy: free
+ vars_files:
+ - ~/.apigee/credentials.yml
+ roles:
- opdk-setup-os-limits
+ tags:
+ - os
- hosts: '{{ hosts }}'
strategy: free
roles:
- opdk-setup-openjdk
+ tags:
+ - openjdk
- hosts: '{{ hosts }}'
strategy: free
@@ -18,6 +30,8 @@
- ~/.apigee/credentials.yml
roles:
- opdk-setup-bootstrap
+ tags:
+ - bootstrap
- hosts: '{{ hosts }}'
strategy: free
@@ -26,10 +40,14 @@
roles:
- opdk-setup-silent-installation-config
- opdk-setup-component-installer
+ tags:
+ - installer
- hosts: '{{ hosts }}'
serial: 1
roles:
+ - { role: opdk-set-reachable, reachable: false }
- { role: opdk-setup-component, profile: '{{ component_profile }}' }
-
-
+ - { role: opdk-set-reachable, reachable: true }
+ tags:
+ - component
