Skip to content

Commit 00347f9

Browse files
kiwikkiwik
authored
Merge pull request apache#150 from animationzl/extract-openrc-as-role
Extract openrc as roles to avoid security risk
2 parents df9e444 + 40b1732 commit 00347f9

File tree

10 files changed

+61
-58
lines changed
  • playbooks
    • gophercloud-acceptance-test-telefonica
    • terraform-provider-flexibleengine-acceptance-test-orange
    • terraform-provider-opentelekomcloud-acceptance-test-opentelekomcloud
    • terraform-provider-telefonicaopencloud-acceptance-test-telefonica
  • roles
  • zuul.d

10 files changed

+61
-58
lines changed

‎playbooks/gophercloud-acceptance-test-telefonica/run.yaml‎

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,12 @@
11
- hosts: all
22
become: yes
3+
roles:
4+
- export-telefonica-openrc
35
tasks:
46
- shell:
57
cmd: |
68
apt-get install python-pip -y
79
pip install -U python-openstackclient
8-
# NOTE: the following commands may include sensitive information please do not print in job logs
9-
export OS_PASSWORD="`echo {{ telefonica_credentials.password }}`"
10-
export OS_AUTH_TYPE="`echo {{ telefonica_credentials.auth_type }}`"
11-
export OS_AUTH_URL="`echo {{ telefonica_credentials.auth_url }}`"
12-
export OS_IDENTITY_API_VERSION="`echo {{ telefonica_credentials.identity_api_version }}`"
13-
export OS_DOMAIN_NAME="`echo {{ telefonica_credentials.domain_name }}`"
14-
export OS_PROJECT_NAME="`echo {{ telefonica_credentials.project_name}}`"
15-
export OS_REGION_NAME="`echo {{ telefonica_credentials.region_name}}`"
16-
export OS_TENANT_NAME="`echo {{ telefonica_credentials.project_name }}`"
17-
export OS_USERNAME="`echo {{ telefonica_credentials.user_name }}`"
1810
1911
export OS_SHARE_NETWORK_ID="foobar"
2012
export OS_FLAVOR_ID_RESIZE=2
@@ -65,4 +57,4 @@
6557
} 2>&1 | tee $TEST_RESULTS_TXTT
6658
executable: /bin/bash
6759
chdir: '{{ zuul.project.src_dir }}'
68-
environment: '{{ golang_env }}'
60+
environment: '{{ golang_env | combine(telefonica_openrc) }}'

‎playbooks/terraform-provider-flexibleengine-acceptance-test-orange/run.yaml‎

Lines changed: 3 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,12 @@
11
- hosts: all
22
become: yes
3+
roles:
4+
- export-orange-openrc
35
tasks:
46
- shell:
57
cmd: |
68
apt-get install python-pip -y
79
pip install -U python-openstackclient
8-
# NOTE: the following commands may include sensitive information please do not print in job logs
9-
export OS_PASSWORD="`echo {{ orange_credentials.password }}`"
10-
export OS_AUTH_TYPE="`echo {{ orange_credentials.auth_type }}`"
11-
export OS_AUTH_URL="`echo {{ orange_credentials.auth_url }}`"
12-
export OS_IDENTITY_API_VERSION="`echo {{ orange_credentials.identity_api_version }}`"
13-
export OS_DOMAIN_NAME="`echo {{ orange_credentials.domain_name }}`"
14-
export OS_PROJECT_NAME="`echo {{ orange_credentials.project_name}}`"
15-
export OS_REGION_NAME="`echo {{ orange_credentials.region_name}}`"
16-
export OS_TENANT_NAME="`echo {{ orange_credentials.project_name }}`"
17-
export OS_USERNAME="`echo {{ orange_credentials.user_name }}`"
18-
export OS_ACCESS_KEY="`echo {{ orange_credentials.access_key }}`"
19-
export OS_SECRET_KEY="`echo {{ orange_credentials.secret_key }}`"
20-
export OS_AVAILABILITY_ZONE="`echo {{ orange_credentials.availability_zone }}`"
2110
2211
export OS_SHARE_NETWORK_ID="foobar"
2312
export OS_FLAVOR_ID_RESIZE="t2.small"
@@ -61,4 +50,4 @@
6150
make testacc 2>&1 | tee $TEST_RESULTS_TXT
6251
executable: /bin/bash
6352
chdir: '{{ zuul.project.src_dir }}'
64-
environment: '{{ golang_env }}'
53+
environment: '{{ golang_env | combine(orange_openrc) }}'

‎playbooks/terraform-provider-opentelekomcloud-acceptance-test-opentelekomcloud/run.yaml‎

Lines changed: 3 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,12 @@
11
- hosts: all
22
become: yes
3+
roles:
4+
- export-opentelekomcloud-openrc
35
tasks:
46
- shell:
57
cmd: |
68
apt-get install python-pip -y
79
pip install -U python-openstackclient
8-
# NOTE: the following commands may include sensitive information please do not print in job logs
9-
export OS_PASSWORD="`echo {{ opentelekomcloud_credentials.password }}`"
10-
export OS_AUTH_TYPE="`echo {{ opentelekomcloud_credentials.auth_type }}`"
11-
export OS_AUTH_URL="`echo {{ opentelekomcloud_credentials.auth_url }}`"
12-
export OS_IDENTITY_API_VERSION="`echo {{ opentelekomcloud_credentials.identity_api_version }}`"
13-
export OS_DOMAIN_NAME="`echo {{ opentelekomcloud_credentials.domain_name }}`"
14-
export OS_PROJECT_NAME="`echo {{ opentelekomcloud_credentials.project_name}}`"
15-
export OS_REGION_NAME="`echo {{ opentelekomcloud_credentials.region_name}}`"
16-
export OS_TENANT_NAME="`echo {{ opentelekomcloud_credentials.project_name }}`"
17-
export OS_USERNAME="`echo {{ opentelekomcloud_credentials.user_name }}`"
18-
export OS_ACCESS_KEY="`echo {{ opentelekomcloud_credentials.access_key }}`"
19-
export OS_SECRET_KEY="`echo {{ opentelekomcloud_credentials.secret_key }}`"
20-
export OS_AVAILABILITY_ZONE="`echo {{ opentelekomcloud_credentials.availability_zone }}`"
2110
2211
set -o pipefail
2312
set -x
@@ -49,4 +38,4 @@
4938
5039
executable: /bin/bash
5140
chdir: '{{ zuul.project.src_dir }}'
52-
environment: '{{ golang_env }}'
41+
environment: '{{ golang_env | combine(opentelekomcloud_openrc) }}'

‎playbooks/terraform-provider-telefonicaopencloud-acceptance-test-telefonica/run.yaml‎

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,12 @@
11
- hosts: all
22
become: yes
3+
roles:
4+
- export-telefonica-openrc
35
tasks:
46
- shell:
57
cmd: |
68
apt-get install python-pip -y
79
pip install -U python-openstackclient
8-
# NOTE: the following commands may include sensitive information please do not print in job logs
9-
export OS_PASSWORD="`echo {{ telefonica_credentials.password }}`"
10-
export OS_AUTH_TYPE="`echo {{ telefonica_credentials.auth_type }}`"
11-
export OS_AUTH_URL="`echo {{ telefonica_credentials.auth_url }}`"
12-
export OS_IDENTITY_API_VERSION="`echo {{ telefonica_credentials.identity_api_version }}`"
13-
export OS_DOMAIN_NAME="`echo {{ telefonica_credentials.domain_name }}`"
14-
export OS_PROJECT_NAME="`echo {{ telefonica_credentials.project_name}}`"
15-
export OS_REGION_NAME="`echo {{ telefonica_credentials.region_name}}`"
16-
export OS_TENANT_NAME="`echo {{ telefonica_credentials.project_name }}`"
17-
export OS_USERNAME="`echo {{ telefonica_credentials.user_name }}`"
1810
1911
export OS_SHARE_NETWORK_ID="foobar"
2012
export OS_FLAVOR_ID_RESIZE='c2.medium'
@@ -59,4 +51,4 @@
5951
6052
executable: /bin/bash
6153
chdir: '{{ zuul.project.src_dir }}'
62-
environment: '{{ golang_env }}'
54+
environment: '{{ golang_env | combine(telefonica_openrc) }}'

‎roles/export-opentelekomcloud-openrc/tasks/main.yaml‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
- name: Set fact for opentelekomcloud openrc
2+
set_fact:
3+
opentelekomcloud_openrc:
4+
OS_PASSWORD: '{{ opentelekomcloud_credentials.password }}'
5+
OS_AUTH_TYPE: '{{ opentelekomcloud_credentials.auth_type }}'
6+
OS_AUTH_URL: '{{ opentelekomcloud_credentials.auth_url }}'
7+
OS_IDENTITY_API_VERSION: '{{ opentelekomcloud_credentials.identity_api_version }}'
8+
OS_DOMAIN_NAME: '{{ opentelekomcloud_credentials.domain_name }}'
9+
OS_PROJECT_NAME: '{{ opentelekomcloud_credentials.project_name}}'
10+
OS_REGION_NAME: '{{ opentelekomcloud_credentials.region_name}}'
11+
OS_TENANT_NAME: '{{ opentelekomcloud_credentials.project_name }}'
12+
OS_USERNAME: '{{ opentelekomcloud_credentials.user_name }}'
13+
OS_ACCESS_KEY: '{{ opentelekomcloud_credentials.access_key }}'
14+
OS_SECRET_KEY: '{{ opentelekomcloud_credentials.secret_key }}'
15+
OS_AVAILABILITY_ZONE: '{{ opentelekomcloud_credentials.availability_zone }}'
16+
no_log: yes

‎roles/export-orange-openrc/tasks/main.yaml‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
- name: Set fact for orange openrc
2+
set_fact:
3+
orange_openrc:
4+
OS_PASSWORD: '{{ orange_credentials.password }}'
5+
OS_AUTH_TYPE: '{{ orange_credentials.auth_type }}'
6+
OS_AUTH_URL: '{{ orange_credentials.auth_url }}'
7+
OS_IDENTITY_API_VERSION: '{{ orange_credentials.identity_api_version }}'
8+
OS_DOMAIN_NAME: '{{ orange_credentials.domain_name }}'
9+
OS_PROJECT_NAME: '{{ orange_credentials.project_name}}'
10+
OS_REGION_NAME: '{{ orange_credentials.region_name}}'
11+
OS_TENANT_NAME: '{{ orange_credentials.project_name }}'
12+
OS_USERNAME: '{{ orange_credentials.user_name }}'
13+
OS_ACCESS_KEY: '{{ orange_credentials.access_key }}'
14+
OS_SECRET_KEY: '{{ orange_credentials.secret_key }}'
15+
OS_AVAILABILITY_ZONE: '{{ orange_credentials.availability_zone }}'
16+
no_log: yes

‎roles/export-telefonica-openrc/tasks/main.yaml‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
- name: Set fact for telefonica openrc
2+
set_fact:
3+
telefonica_openrc:
4+
OS_PASSWORD: '{{ telefonica_credentials.password }}'
5+
OS_AUTH_TYPE: '{{ telefonica_credentials.auth_type }}'
6+
OS_AUTH_URL: '{{ telefonica_credentials.auth_url }}'
7+
OS_IDENTITY_API_VERSION: '{{ telefonica_credentials.identity_api_version }}'
8+
OS_DOMAIN_NAME: '{{ telefonica_credentials.domain_name }}'
9+
OS_PROJECT_NAME: '{{ telefonica_credentials.project_name}}'
10+
OS_REGION_NAME: '{{ telefonica_credentials.region_name}}'
11+
OS_TENANT_NAME: '{{ telefonica_credentials.project_name }}'
12+
OS_USERNAME: '{{ telefonica_credentials.user_name }}'
13+
no_log: yes

‎roles/export-vexxhost-openrc/tasks/main.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,3 +14,4 @@
1414
OS_PASSWORD: '{{ vexxhost_credentials.password }}'
1515
OS_REGION_NAME: '{{ vexxhost_credentials.region_name }}'
1616
OS_DOMAIN_NAME: '{{ vexxhost_credentials.user_domain_name }}'
17+
no_log: yes

‎zuul.d/jobs.yaml‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -83,14 +83,6 @@
8383
os_branch: 'stable/mitaka'
8484
nodeset: ubuntu-trusty
8585

86-
# Gophercloud acceptance tests with Telefonica cloud
87-
- job:
88-
name: gophercloud-acceptance-test-telefonica
89-
parent: golang-test
90-
description: |
91-
Run gophercloud acceptance test against telefonica cloud
92-
run: playbooks/gophercloud-acceptance-test-telefonica/run.yaml
93-
9486
# Terraform-provider-openstack jobs
9587
- job:
9688
name: terraform-provider-openstack-unittest

‎zuul.d/secrets.yaml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
# "encrypt_secret.py" in zuul/tools/, following is a example to encrypt the username
33
# echo "your_username" | ./encrypt_secret.py http://zuul-web-ip:9000/openlab theopenlab/openlab-zuul-jobs
44

5+
# TODO: Deprecated for now, need to update when get new dedicated account
56
- secret:
67
name: telefonica_credentials
78
data:
@@ -74,6 +75,7 @@
7475
Xeke6lnQ54oBN+3iNByArBOm2bL3uSKQyRy97uVNr+2PQCp3vd0Ic2T6N2cTUwctm2GSs
7576
dN5OaheYYKStUoqR2vCxADvB5tssTR+4AA7JB8K22apmNb/XA4Zzaqx1L1wJNw=
7677

78+
# TODO: Deprecated for now, need to update when get new dedicated account
7779
- secret:
7880
name: orange_credentials
7981
data:
@@ -179,6 +181,7 @@
179181
ZE9YnBJH0U/0FchGt4P1X1UXgTlGEOxa2FRYjHyfgyK02vuhtKE/4biruqHveEPnw7Rpy
180182
ubs4p1hw7nTIgFtNCAt8AhxT1FK8lgmgyyc14qiJJCZ02S9U0b1x10zjw5lwpo=
181183

184+
# TODO: Deprecated for now, need to update when get new dedicated account
182185
- secret:
183186
name: opentelekomcloud_credentials
184187
data:

0 commit comments

Comments
 (0)