Skip to content

Upstream rebase #14

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-merge-robot merged 15 commits into from
Jan 30, 2019
Merged

Upstream rebase #14

Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
2f10a5e
Fixed bootstrapping of CentOS machine (#186)
Jan 11, 2019
3a4da3d
Tagging of created network resources (#178)
Jan 11, 2019
b1e8920
Move OS_CLOUD environment variable to ConfigMap. (#187)
ainmosni Jan 16, 2019
2b1ecf5
add UserDataSecret into deepcopy file (#188)
yangy2000 Jan 17, 2019
2ff2b66
Improve generator readme (#191)
tani-yu Jan 17, 2019
2a3418b
Remove need to mount ssh keys in the manager container (#192)
flaper87 Jan 17, 2019
8b7af4f
Switch to master branch for cluster-api (#195)
flaper87 Jan 18, 2019
93e0dbc
Use corev1.SecretReference for CloudsSecrets too (#194)
flaper87 Jan 18, 2019
e04ba85
Update cluster-api version (#199)
YorikSar Jan 23, 2019
807ca6a
Fix clustercli CLI in README (#196)
YorikSar Jan 23, 2019
4042ccb
Fix default cloud usage when cloudsSecret is absent (#197)
YorikSar Jan 23, 2019
9cb428a
Use # as separator for sed s command (#198)
YorikSar Jan 23, 2019
6b53373
Add chrigl to cluster-api-openstack-maintainers (#201)
Jan 24, 2019
6cd6699
Check that the old VM has been deleted before creating a new VM (#200)
Jan 24, 2019
cf0dc88
move rbac from hard code to generate (#189)
jichenjc Jan 28, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Use # as separator for sed s command (#198) 
base64 output can contain `/` which breaks sed as it considers `/` to be
end of command.

Also remove remnants of SSH key substitution in templates.
  • Loading branch information
@YorikSar @flaper87
YorikSar authored and flaper87 committed Jan 28, 2019
commit 9cb428a157649f6a2f7b35a54625cae2e93e1301
20 changes: 7 additions & 13 deletions cmd/clusterctl/examples/openstack/generate-yaml.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,10 +125,7 @@ PROVIDERCOMPONENT_GENERATED_FILE=${OUTPUT_DIR}/provider-components.yaml
MASTER_USER_DATA_FILE=${TEMPLATES_PATH}/master-user-data.sh
WORKER_USER_DATA_FILE=${TEMPLATES_PATH}/worker-user-data.sh

MACHINE_CONTROLLER_SSH_PUBLIC_FILE=openstack_tmp.pub
MACHINE_CONTROLLER_SSH_PUBLIC=
MACHINE_CONTROLLER_SSH_PRIVATE_FILE=openstack_tmp
MACHINE_CONTROLLER_SSH_PRIVATE=
MACHINE_CONTROLLER_SSH_HOME=${HOME}/.ssh/

CONTROLLER_IMAGE_VERSION="0.0.0-alpha.4"
Expand Down Expand Up @@ -213,19 +210,19 @@ if [[ "$OS" =~ "Linux" ]]; then
OPENSTACK_CLOUD_CONFIG=$(echo "$OPENSTACK_CLOUD_CONFIG_PLAIN"|base64 -w0)
OPENSTACK_CLOUD_PROVIDER_CONF=$(echo "$OPENSTACK_CLOUD_PROVIDER_CONF_PLAIN"|base64 -w0)
MASTER_USER_DATA=$(echo "$MASTER_USER_DATA_PLAIN" \
| sed -e "s/\$OPENSTACK_CLOUD_PROVIDER_CONF/$OPENSTACK_CLOUD_PROVIDER_CONF/" \
| sed -e "s#\$OPENSTACK_CLOUD_PROVIDER_CONF#$OPENSTACK_CLOUD_PROVIDER_CONF#" \
| base64 -w0)
WORKER_USER_DATA=$(echo "$WORKER_USER_DATA_PLAIN" \
| sed -e "s/\$OPENSTACK_CLOUD_PROVIDER_CONF/$OPENSTACK_CLOUD_PROVIDER_CONF/" \
| sed -e "s#\$OPENSTACK_CLOUD_PROVIDER_CONF#$OPENSTACK_CLOUD_PROVIDER_CONF#" \
| base64 -w0)
elif [[ "$OS" =~ "Darwin" ]]; then
OPENSTACK_CLOUD_CONFIG=$(echo "$OPENSTACK_CLOUD_CONFIG_PLAIN"|base64)
OPENSTACK_CLOUD_PROVIDER_CONF=$(echo "$OPENSTACK_CLOUD_PROVIDER_CONF_PLAIN"|base64)
MASTER_USER_DATA=$(echo "$MASTER_USER_DATA_PLAIN" \
| sed -e "s/\$OPENSTACK_CLOUD_PROVIDER_CONF/$OPENSTACK_CLOUD_PROVIDER_CONF/" \
| sed -e "s#\$OPENSTACK_CLOUD_PROVIDER_CONF#$OPENSTACK_CLOUD_PROVIDER_CONF#" \
| base64)
WORKER_USER_DATA=$(echo "$WORKER_USER_DATA_PLAIN" \
| sed -e "s/\$OPENSTACK_CLOUD_PROVIDER_CONF/$OPENSTACK_CLOUD_PROVIDER_CONF/" \
| sed -e "s#\$OPENSTACK_CLOUD_PROVIDER_CONF#$OPENSTACK_CLOUD_PROVIDER_CONF#" \
| base64)
else
echo "Unrecognized OS : $OS"
Expand Down Expand Up @@ -265,12 +262,9 @@ do
done

cat "$PROVIDERCOMPONENT_TEMPLATE_FILE" \
| sed -e "s/\$OPENSTACK_CLOUD_CONFIG/$OPENSTACK_CLOUD_CONFIG/" \
| sed -e "s/\$MACHINE_CONTROLLER_SSH_USER/$MACHINE_CONTROLLER_SSH_USER/" \
| sed -e "s/\$MACHINE_CONTROLLER_SSH_PUBLIC/$MACHINE_CONTROLLER_SSH_PUBLIC/" \
| sed -e "s/\$MACHINE_CONTROLLER_SSH_PRIVATE/$MACHINE_CONTROLLER_SSH_PRIVATE/" \
| sed -e "s/\$MASTER_USER_DATA/$MASTER_USER_DATA/" \
| sed -e "s/\$WORKER_USER_DATA/$WORKER_USER_DATA/" \
| sed -e "s#\$OPENSTACK_CLOUD_CONFIG#$OPENSTACK_CLOUD_CONFIG#" \
| sed -e "s#\$MASTER_USER_DATA#$MASTER_USER_DATA#" \
| sed -e "s#\$WORKER_USER_DATA#$WORKER_USER_DATA#" \
>> "$PROVIDERCOMPONENT_GENERATED_FILE"

if [[ "$OS" =~ "Linux" ]]; then
Expand Down