Skip to content

Commit

Permalink
Fix scripts for run->exec change in Juju latest.
Browse files Browse the repository at this point in the history
  • Loading branch information
@javacruft
javacruft committed Oct 9, 2024
1 parent 211adc4 commit e2f02f6
Show file tree
Hide file tree
Showing 7 changed files with 15 additions and 15 deletions.
4 changes: 2 additions & 2 deletions scripts/novarc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ for param in $_OS_PARAMS; do
unset $param
done

_keystone_ip=$(juju run $_juju_model_arg --unit keystone/leader 'unit-get private-address')
_password=$(juju run $_juju_model_arg --unit keystone/leader 'leader-get admin_passwd')
_keystone_ip=$(juju exec $_juju_model_arg --unit keystone/leader 'unit-get private-address')
_password=$(juju exec $_juju_model_arg --unit keystone/leader 'leader-get admin_passwd')

unset _OS_PARAMS
export OS_USERNAME=admin
Expand Down
2 changes: 1 addition & 1 deletion scripts/novarcv3_demo_project
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ for param in $_OS_PARAMS; do
done
unset _OS_PARAMS

_keystone_ip=$(juju run $_juju_model_arg --unit keystone/leader 'unit-get private-address')
_keystone_ip=$(juju exec $_juju_model_arg --unit keystone/leader 'unit-get private-address')

export OS_AUTH_URL=${OS_AUTH_PROTOCOL:-http}://${_keystone_ip}:5000/v3
export OS_USERNAME=demo
Expand Down
4 changes: 2 additions & 2 deletions scripts/novarcv3_domain
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ for param in $_OS_PARAMS; do
done
unset _OS_PARAMS

_keystone_ip=$(juju run $_juju_model_arg --unit keystone/leader 'unit-get private-address')
_password=$(juju run $_juju_model_arg --unit keystone/leader 'leader-get admin_passwd')
_keystone_ip=$(juju exec $_juju_model_arg --unit keystone/leader 'unit-get private-address')
_password=$(juju exec $_juju_model_arg --unit keystone/leader 'leader-get admin_passwd')

export OS_AUTH_URL=${OS_AUTH_PROTOCOL:-http}://${_keystone_ip}:5000/v3
export OS_USERNAME=admin
Expand Down
4 changes: 2 additions & 2 deletions scripts/novarcv3_project
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ for param in $_OS_PARAMS; do
done
unset _OS_PARAMS

_keystone_ip=$(juju run $_juju_model_arg --unit keystone/leader 'unit-get private-address')
_password=$(juju run $_juju_model_arg --unit keystone/leader 'leader-get admin_passwd')
_keystone_ip=$(juju exec $_juju_model_arg --unit keystone/leader 'unit-get private-address')
_password=$(juju exec $_juju_model_arg --unit keystone/leader 'leader-get admin_passwd')

export OS_AUTH_URL=${OS_AUTH_PROTOCOL:-http}://${_keystone_ip}:5000/v3
export OS_USERNAME=admin
Expand Down
4 changes: 2 additions & 2 deletions scripts/novarcv3_ssl_demo_project
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ unset _OS_PARAMS
test -d $HOME/.cache || mkdir $HOME/.cache
_root_ca=$HOME/.cache/openstack-root-ca.crt

_keystone_ip=$(juju run $_juju_model_arg --unit keystone/leader 'unit-get private-address')
juju run $_juju_model_arg --unit vault/leader 'leader-get root-ca' > ${_root_ca}
_keystone_ip=$(juju exec $_juju_model_arg --unit keystone/leader 'unit-get private-address')
juju exec $_juju_model_arg --unit vault/leader 'leader-get root-ca' > ${_root_ca}

export OS_AUTH_PROTOCOL=https
export OS_CACERT=${_root_ca}
Expand Down
6 changes: 3 additions & 3 deletions scripts/novarcv3_ssl_domain
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ unset _OS_PARAMS
test -d $HOME/.cache || mkdir $HOME/.cache
_root_ca=$HOME/.cache/openstack-root-ca.crt

_keystone_ip=$(juju run $_juju_model_arg --unit keystone/leader 'unit-get private-address')
_password=$(juju run $_juju_model_arg --unit keystone/leader 'leader-get admin_passwd')
juju run $_juju_model_arg --unit vault/leader 'leader-get root-ca' > ${_root_ca}
_keystone_ip=$(juju exec $_juju_model_arg --unit keystone/leader 'unit-get private-address')
_password=$(juju exec $_juju_model_arg --unit keystone/leader 'leader-get admin_passwd')
juju exec $_juju_model_arg --unit vault/leader 'leader-get root-ca' > ${_root_ca}

export OS_AUTH_PROTOCOL=https
export OS_CACERT=${_root_ca}
Expand Down
6 changes: 3 additions & 3 deletions scripts/novarcv3_ssl_project
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ unset _OS_PARAMS
test -d $HOME/.cache || mkdir $HOME/.cache
_root_ca=$HOME/.cache/openstack-root-ca.crt

_keystone_ip=$(juju run $_juju_model_arg --unit keystone/leader 'unit-get private-address')
_password=$(juju run $_juju_model_arg --unit keystone/leader 'leader-get admin_passwd')
juju run $_juju_model_arg --unit vault/leader 'leader-get root-ca' > ${_root_ca}
_keystone_ip=$(juju exec $_juju_model_arg --unit keystone/leader 'unit-get private-address')
_password=$(juju exec $_juju_model_arg --unit keystone/leader 'leader-get admin_passwd')
juju exec $_juju_model_arg --unit vault/leader 'leader-get root-ca' > ${_root_ca}

export OS_AUTH_PROTOCOL=https
export OS_CACERT=${_root_ca}
Expand Down

0 comments on commit e2f02f6

Please sign in to comment.