Skip to content

Commit cbe3e20

Browse files
authored
Correct references to AWS policy documents
* Move path to AWS policy documents to common role * Promulgate to plat and data roles Signed-off-by: Daniel Chaffelson <chaffelson@gmail.com>
1 parent b80bb38 commit cbe3e20

File tree

3 files changed

+4
-3
lines changed

3 files changed

+4
-3
lines changed

roles/common/defaults/main.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,8 @@ common__datalake_name_suffix: "{{ env.datalake.suffix | default(comm
124124
common__tunnel: "{{ env.tunnel | default(False) }}"
125125
common__public_endpoint_access: "{{ env.public_endpoint_access | default(not common__tunnel) }}"
126126

127-
common__env_admin_password: "{{ globals.admin_password | mandatory }}"
127+
common__env_admin_password: "{{ globals.admin_password | mandatory }}"
128+
common__aws_policy_urls_default_root: "https://raw.githubusercontent.com/hortonworks/cloudbreak/master/cloud-aws-common/src/main/resources/definitions/cdp"
128129

129130
# Deploy
130131
common__setup_runtime: "{{ ml is defined or de is defined or datahub is defined or opdb is defined or dw is defined or df is defined | default(False) | bool }}"

roles/data/vars/main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
# See the License for the specific language governing permissions and
1515
# limitations under the License.
1616

17-
data__aws_policy_urls_default_root: "https://github.com/hortonworks/cloudbreak/raw/master/cloud-aws/src/main/resources/definitions/cdp"
17+
data__aws_policy_urls_default_root: "{{ common__aws_policy_urls_default_root }}"
1818
data__aws_policy_urls_default:
1919
read_only: "{{ data__aws_policy_urls_default_root }}/aws-cdp-bucket-access-policy.json"
2020
read_write: "{{ data__aws_policy_urls_default_root }}/aws-cdp-datalake-admin-s3-policy.json"

roles/platform/vars/main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
# limitations under the License.
1616

1717
# Vars for platform
18-
plat__aws_policy_urls_default_root: "https://raw.githubusercontent.com/hortonworks/cloudbreak/master/cloud-aws-common/src/main/resources/definitions/cdp"
18+
plat__aws_policy_urls_default_root: "{{ common__aws_policy_urls_default_root }}"
1919
plat__aws_policy_urls_default:
2020
log: "{{ plat__aws_policy_urls_default_root }}/aws-cdp-log-policy.json"
2121
ranger_audit_s3: "{{ plat__aws_policy_urls_default_root }}/aws-cdp-ranger-audit-s3-policy.json"

0 commit comments

Comments
 (0)