File tree Expand file tree Collapse file tree 3 files changed +8
-8
lines changed
src/core-switch/scripts/openstack/yoga/nodes/controller/deploy Expand file tree Collapse file tree 3 files changed +8
-8
lines changed Original file line number Diff line number Diff line change @@ -28,8 +28,8 @@ cd ~/src/openstack
28
28
[[ -d $SERVICE ]] || git clone https://opendev.org/openstack/$SERVICE .git -b stable/yoga
29
29
30
30
[[ $REBUILD == " 1" ]] && sudo rm -rf /var/lib/$SERVICE /src/$SERVICE
31
- sudo cp -R ~ /src/openstack/$SERVICE /var/lib/$SERVICE /src
32
- [[ -f ~ /install/patch/ $SERVICE .conf.patch ]] && sudo cp ~ /install/patch/$SERVICE .conf.patch /var/lib/$SERVICE /patch
31
+ sudo cp -vR ~ /src/openstack/$SERVICE /var/lib/$SERVICE /src
32
+ sudo cp -v ~ /install/patch/$SERVICE * .conf.patch /var/lib/$SERVICE /patch
33
33
34
34
# this is actually flawed but we won't see a problem
35
35
if rg -qF $SERVICE /etc/passwd
@@ -113,7 +113,7 @@ sudo chown www-data:www-data /var/log/nginx/$SERVICE
113
113
sudo mkdir /var/www/$SERVICE
114
114
115
115
# port forwarder
116
- HOST_IP_ADDRESS=$( rg core \\ .homelab /etc/hosts | cut -d " " -f1)
116
+ HOST_IP_ADDRESS=$( rg -F $( hostname -f ) /etc/hosts | cut -d " " -f1)
117
117
sudo tee /lib/systemd/system/os-fwd-${SERVICE} .service << EOF
118
118
[Unit]
119
119
Description=${SERVICE} API forwarder
Original file line number Diff line number Diff line change @@ -26,8 +26,8 @@ cd ~/src/openstack
26
26
[[ -d $SERVICE ]] || git clone https://opendev.org/openstack/$SERVICE .git -b stable/yoga
27
27
28
28
[[ $REBUILD == " 1" ]] && sudo rm -rf /var/lib/$SERVICE /src/$SERVICE
29
- sudo cp -R ~ /src/openstack/$SERVICE /var/lib/$SERVICE /src
30
- sudo cp ~ /install/patch/$SERVICE * .conf.patch /var/lib/$SERVICE /patch || true
29
+ sudo cp -vR ~ /src/openstack/$SERVICE /var/lib/$SERVICE /src
30
+ sudo cp -v ~ /install/patch/$SERVICE * .conf.patch /var/lib/$SERVICE /patch
31
31
32
32
# this is actually flawed but we won't see a problem
33
33
if rg -qF $SERVICE /etc/passwd
@@ -114,7 +114,7 @@ sudo chown www-data:www-data /var/log/nginx/$SERVICE
114
114
sudo mkdir /var/www/$SERVICE
115
115
116
116
# port forwarder
117
- HOST_IP_ADDRESS=$( rg core \\ .homelab /etc/hosts | cut -d " " -f1)
117
+ HOST_IP_ADDRESS=$( rg -F $( hostname -f ) /etc/hosts | cut -d " " -f1)
118
118
sudo tee /lib/systemd/system/os-fwd-${SERVICE} .service << EOF
119
119
[Unit]
120
120
Description=${SERVICE} API forwarder
Original file line number Diff line number Diff line change @@ -28,7 +28,7 @@ cd ~/src/openstack
28
28
29
29
[[ $REBUILD == " 1" ]] && sudo rm -rf /var/lib/$SERVICE /src/$SERVICE
30
30
sudo cp -R ~ /src/openstack/$SERVICE /var/lib/$SERVICE /src
31
- sudo cp ~ /install/patch/$SERVICE * .conf.patch /var/lib/$SERVICE /patch || true
31
+ sudo cp ~ /install/patch/$SERVICE * .conf.patch /var/lib/$SERVICE /patch
32
32
33
33
# this is actually flawed but we won't see a problem
34
34
if rg -qF $SERVICE /etc/passwd
@@ -113,7 +113,7 @@ sudo chown www-data:www-data /var/log/nginx/$SERVICE
113
113
sudo mkdir /var/www/$SERVICE
114
114
115
115
# port forwarder
116
- HOST_IP_ADDRESS=$( rg core \\ .homelab /etc/hosts | cut -d " " -f1)
116
+ HOST_IP_ADDRESS=$( rg -F $( hostname -f ) /etc/hosts | cut -d " " -f1)
117
117
sudo tee /lib/systemd/system/os-fwd-${SERVICE} .service << EOF
118
118
[Unit]
119
119
Description=${SERVICE} API forwarder
You can’t perform that action at this time.
0 commit comments