API tools faq
paste
Advertisement
Guest User

Untitled

a guest
Apr 14th, 2015
1,712
0
Never
Add comment
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 10.62 KB | None | 0 0
raw download clone embed print report
  1. diff --git a/functions-common b/functions-common
  2. index f8543c1..1b29824 100644
  3. --- a/functions-common
  4. +++ b/functions-common
  5. @@ -621,10 +621,10 @@ function install_default_policy {
  6. local sample_policy_dir="${project_dir}/etc/${project}/policy.d"
  7.  
  8. # first copy any policy.json
  9. - cp -p $sample_conf_dir/policy.json $conf_dir
  10. + sudo cp -p $sample_conf_dir/policy.json $conf_dir
  11. # then optionally copy over policy.d
  12. if [[ -d $sample_policy_dir ]]; then
  13. - cp -r $sample_policy_dir $conf_dir/policy.d
  14. + sudo cp -r $sample_policy_dir $conf_dir/policy.d
  15. fi
  16. }
  17.  
  18. @@ -1827,7 +1827,7 @@ function cidr2netmask {
  19. # cp_it source destination
  20. function cp_it {
  21. if [ -e $1 ] || [ -d $1 ]; then
  22. - cp -pRL $1 $2
  23. + sudo cp -pRL $1 $2
  24. fi
  25. }
  26.  
  27. diff --git a/inc/ini-config b/inc/ini-config
  28. index 26401f3..0a06c38 100644
  29. --- a/inc/ini-config
  30. +++ b/inc/ini-config
  31. @@ -38,7 +38,7 @@ function inicomment {
  32. local section=$2
  33. local option=$3
  34.  
  35. - sed -i -e "/^\[$section\]/,/^\[.*\]/ s|^\($option[ \t]*=.*$\)|#\1|" "$file"
  36. + sudo sed -i -e "/^\[$section\]/,/^\[.*\]/ s|^\($option[ \t]*=.*$\)|#\1|" "$file"
  37. $xtrace
  38. }
  39.  
  40. @@ -52,7 +52,7 @@ function iniget {
  41. local option=$3
  42. local line
  43.  
  44. - line=$(sed -ne "/^\[$section\]/,/^\[.*\]/ { /^$option[ \t]*=/ p; }" "$file")
  45. + line=$(sudo sed -ne "/^\[$section\]/,/^\[.*\]/ { /^$option[ \t]*=/ p; }" "$file")
  46. echo ${line#*=}
  47. $xtrace
  48. }
  49. @@ -67,7 +67,7 @@ function iniget_multiline {
  50. local option=$3
  51. local values
  52.  
  53. - values=$(sed -ne "/^\[$section\]/,/^\[.*\]/ { s/^$option[ \t]*=[ \t]*//gp; }" "$file")
  54. + values=$(sudo sed -ne "/^\[$section\]/,/^\[.*\]/ { s/^$option[ \t]*=[ \t]*//gp; }" "$file")
  55. echo ${values}
  56. $xtrace
  57. }
  58. @@ -82,7 +82,7 @@ function ini_has_option {
  59. local option=$3
  60. local line
  61.  
  62. - line=$(sed -ne "/^\[$section\]/,/^\[.*\]/ { /^$option[ \t]*=/ p; }" "$file")
  63. + line=$(sudo sed -ne "/^\[$section\]/,/^\[.*\]/ { /^$option[ \t]*=/ p; }" "$file")
  64. $xtrace
  65. [ -n "$line" ]
  66. }
  67. @@ -107,7 +107,7 @@ function iniadd_literal {
  68. [[ -z $section || -z $option ]] && return
  69.  
  70. # Add it
  71. - sed -i -e "/^\[$section\]/ a\\
  72. + sudo sed -i -e "/^\[$section\]/ a\\
  73. $option = $value
  74. " "$file"
  75.  
  76. @@ -126,7 +126,7 @@ function inidelete {
  77. [[ -z $section || -z $option ]] && return
  78.  
  79. # Remove old values
  80. - sed -i -e "/^\[$section\]/,/^\[.*\]/ { /^$option[ \t]*=/ d; }" "$file"
  81. + sudo sed -i -e "/^\[$section\]/,/^\[.*\]/ { /^$option[ \t]*=/ d; }" "$file"
  82.  
  83. $xtrace
  84. }
  85. @@ -145,17 +145,17 @@ function iniset {
  86.  
  87. if ! grep -q "^\[$section\]" "$file" 2>/dev/null; then
  88. # Add section at the end
  89. - echo -e "\n[$section]" >>"$file"
  90. + echo -e "\n[$section]" | sudo tee --append "$file"
  91. fi
  92. if ! ini_has_option "$file" "$section" "$option"; then
  93. # Add it
  94. - sed -i -e "/^\[$section\]/ a\\
  95. + sudo sed -i -e "/^\[$section\]/ a\\
  96. $option = $value
  97. " "$file"
  98. else
  99. local sep=$(echo -ne "\x01")
  100. # Replace it
  101. - sed -i -e '/^\['${section}'\]/,/^\[.*\]/ s'${sep}'^\('${option}'[ \t]*=[ \t]*\).*$'${sep}'\1'"${value}"${sep} "$file"
  102. + sudo sed -i -e '/^\['${section}'\]/,/^\[.*\]/ s'${sep}'^\('${option}'[ \t]*=[ \t]*\).*$'${sep}'\1'"${value}"${sep} "$file"
  103. fi
  104. $xtrace
  105. }
  106. @@ -182,11 +182,11 @@ function iniset_multiline {
  107. echo -e "\n[$section]" >>"$file"
  108. else
  109. # Remove old values
  110. - sed -i -e "/^\[$section\]/,/^\[.*\]/ { /^$option[ \t]*=/ d; }" "$file"
  111. + sudo sed -i -e "/^\[$section\]/,/^\[.*\]/ { /^$option[ \t]*=/ d; }" "$file"
  112. fi
  113. # Add new ones
  114. for v in $values; do
  115. - sed -i -e "/^\[$section\]/ a\\
  116. + sudo sed -i -e "/^\[$section\]/ a\\
  117. $option = $v
  118. " "$file"
  119. done
  120. @@ -201,7 +201,7 @@ function iniuncomment {
  121. local file=$1
  122. local section=$2
  123. local option=$3
  124. - sed -i -e "/^\[$section\]/,/^\[.*\]/ s|[^ \t]*#[ \t]*\($option[ \t]*=.*$\)|\1|" "$file"
  125. + sudo sed -i -e "/^\[$section\]/,/^\[.*\]/ s|[^ \t]*#[ \t]*\($option[ \t]*=.*$\)|\1|" "$file"
  126. $xtrace
  127. }
  128.  
  129. diff --git a/lib/cinder b/lib/cinder
  130. index de41bc5..6b757b7 100644
  131. --- a/lib/cinder
  132. +++ b/lib/cinder
  133. @@ -175,13 +175,13 @@ function cleanup_cinder {
  134. function configure_cinder {
  135. sudo install -d -o $STACK_USER -m 755 $CINDER_CONF_DIR
  136.  
  137. - cp -p $CINDER_DIR/etc/cinder/policy.json $CINDER_CONF_DIR
  138. + sudo cp -p $CINDER_DIR/etc/cinder/policy.json $CINDER_CONF_DIR
  139.  
  140. rm -f $CINDER_CONF
  141.  
  142. configure_rootwrap cinder $CINDER_BIN_DIR/cinder-rootwrap $CINDER_DIR/etc/cinder
  143.  
  144. - cp $CINDER_DIR/etc/cinder/api-paste.ini $CINDER_API_PASTE_INI
  145. + sudo cp $CINDER_DIR/etc/cinder/api-paste.ini $CINDER_API_PASTE_INI
  146.  
  147. inicomment $CINDER_API_PASTE_INI filter:authtoken auth_host
  148. inicomment $CINDER_API_PASTE_INI filter:authtoken auth_port
  149. diff --git a/lib/glance b/lib/glance
  150. index 578c88a..a96e45f 100644
  151. --- a/lib/glance
  152. +++ b/lib/glance
  153. @@ -94,7 +94,7 @@ function configure_glance {
  154. sudo install -d -o $STACK_USER $GLANCE_CONF_DIR $GLANCE_METADEF_DIR
  155.  
  156. # Copy over our glance configurations and update them
  157. - cp $GLANCE_DIR/etc/glance-registry.conf $GLANCE_REGISTRY_CONF
  158. + sudo cp $GLANCE_DIR/etc/glance-registry.conf $GLANCE_REGISTRY_CONF
  159. iniset $GLANCE_REGISTRY_CONF DEFAULT debug $ENABLE_DEBUG_LOG_LEVEL
  160. inicomment $GLANCE_REGISTRY_CONF DEFAULT log_file
  161. local dburl=`database_connection_url glance`
  162. @@ -107,7 +107,7 @@ function configure_glance {
  163. fi
  164. iniset_rpc_backend glance $GLANCE_REGISTRY_CONF
  165.  
  166. - cp $GLANCE_DIR/etc/glance-api.conf $GLANCE_API_CONF
  167. + sudo cp $GLANCE_DIR/etc/glance-api.conf $GLANCE_API_CONF
  168. iniset $GLANCE_API_CONF DEFAULT debug $ENABLE_DEBUG_LOG_LEVEL
  169. inicomment $GLANCE_API_CONF DEFAULT log_file
  170. iniset $GLANCE_API_CONF DEFAULT sql_connection $dburl
  171. @@ -182,11 +182,11 @@ function configure_glance {
  172. setup_colorized_logging $GLANCE_REGISTRY_CONF DEFAULT tenant user
  173. fi
  174.  
  175. - cp -p $GLANCE_DIR/etc/glance-registry-paste.ini $GLANCE_REGISTRY_PASTE_INI
  176. + sudo cp -p $GLANCE_DIR/etc/glance-registry-paste.ini $GLANCE_REGISTRY_PASTE_INI
  177.  
  178. - cp -p $GLANCE_DIR/etc/glance-api-paste.ini $GLANCE_API_PASTE_INI
  179. + sudo cp -p $GLANCE_DIR/etc/glance-api-paste.ini $GLANCE_API_PASTE_INI
  180.  
  181. - cp $GLANCE_DIR/etc/glance-cache.conf $GLANCE_CACHE_CONF
  182. + sudo cp $GLANCE_DIR/etc/glance-cache.conf $GLANCE_CACHE_CONF
  183. iniset $GLANCE_CACHE_CONF DEFAULT debug $ENABLE_DEBUG_LOG_LEVEL
  184. inicomment $GLANCE_CACHE_CONF DEFAULT log_file
  185. iniset $GLANCE_CACHE_CONF DEFAULT use_syslog $SYSLOG
  186. @@ -206,10 +206,10 @@ function configure_glance {
  187. iniset $GLANCE_CACHE_CONF DEFAULT filesystem_store_datadir $GLANCE_IMAGE_DIR/
  188. iniset $GLANCE_CACHE_CONF glance_store filesystem_store_datadir $GLANCE_IMAGE_DIR/
  189.  
  190. - cp -p $GLANCE_DIR/etc/policy.json $GLANCE_POLICY_JSON
  191. - cp -p $GLANCE_DIR/etc/schema-image.json $GLANCE_SCHEMA_JSON
  192. + sudo cp -p $GLANCE_DIR/etc/policy.json $GLANCE_POLICY_JSON
  193. + sudo cp -p $GLANCE_DIR/etc/schema-image.json $GLANCE_SCHEMA_JSON
  194.  
  195. - cp -p $GLANCE_DIR/etc/metadefs/*.json $GLANCE_METADEF_DIR
  196. + sudo cp -p $GLANCE_DIR/etc/metadefs/*.json $GLANCE_METADEF_DIR
  197.  
  198. if is_ssl_enabled_service "cinder" || is_service_enabled tls-proxy; then
  199. CINDER_SERVICE_HOST=${CINDER_SERVICE_HOST:-$SERVICE_HOST}
  200. diff --git a/lib/keystone b/lib/keystone
  201. index 31659f4..8aed369 100644
  202. --- a/lib/keystone
  203. +++ b/lib/keystone
  204. @@ -191,10 +191,10 @@ function configure_keystone {
  205. sudo install -d -o $STACK_USER $KEYSTONE_CONF_DIR
  206.  
  207. if [[ "$KEYSTONE_CONF_DIR" != "$KEYSTONE_DIR/etc" ]]; then
  208. - install -m 600 $KEYSTONE_DIR/etc/keystone.conf.sample $KEYSTONE_CONF
  209. - cp -p $KEYSTONE_DIR/etc/policy.json $KEYSTONE_CONF_DIR
  210. + sudo install -m 600 $KEYSTONE_DIR/etc/keystone.conf.sample $KEYSTONE_CONF
  211. + sudo cp -p $KEYSTONE_DIR/etc/policy.json $KEYSTONE_CONF_DIR
  212. if [[ -f "$KEYSTONE_DIR/etc/keystone-paste.ini" ]]; then
  213. - cp -p "$KEYSTONE_DIR/etc/keystone-paste.ini" "$KEYSTONE_PASTE_INI"
  214. + sudo cp -p "$KEYSTONE_DIR/etc/keystone-paste.ini" "$KEYSTONE_PASTE_INI"
  215. fi
  216. fi
  217. if [[ -f "$KEYSTONE_PASTE_INI" ]]; then
  218. @@ -297,7 +297,7 @@ function configure_keystone {
  219. echo "catalog.RegionOne.network.name = Neutron Service" >> $KEYSTONE_CATALOG
  220. fi
  221.  
  222. - sed -e "
  223. + sudo sed -e "
  224. s,%SERVICE_HOST%,$SERVICE_HOST,g;
  225. s,%S3_SERVICE_PORT%,$S3_SERVICE_PORT,g;
  226. " -i $KEYSTONE_CATALOG
  227. @@ -345,9 +345,9 @@ function configure_keystone_extensions {
  228. continue
  229. fi
  230. api_v3=$(iniget $KEYSTONE_PASTE_INI pipeline:api_v3 pipeline)
  231. - extension=$(echo $api_v3 | sed -ne "/${extension_value}/ p;" )
  232. + extension=$(echo $api_v3 | sudo sed -ne "/${extension_value}/ p;" )
  233. if [[ -z $extension ]]; then
  234. - api_v3_extension=$(echo $api_v3 | sed -ne "s/service_v3/${extension_value}_extension service_v3/p;" )
  235. + api_v3_extension=$(echo $api_v3 | sudo sed -ne "s/service_v3/${extension_value}_extension service_v3/p;" )
  236. iniset $KEYSTONE_PASTE_INI pipeline:api_v3 pipeline "$api_v3_extension"
  237. fi
  238. done
  239. diff --git a/lib/nova b/lib/nova
  240. index 807dfce..2b27fba 100644
  241. --- a/lib/nova
  242. +++ b/lib/nova
  243. @@ -234,7 +234,7 @@ function configure_nova {
  244.  
  245. if [[ "$ENABLED_SERVICES" =~ "n-api" ]]; then
  246. # Get the sample configuration file in place
  247. - cp $NOVA_DIR/etc/nova/api-paste.ini $NOVA_CONF_DIR
  248. + sudo cp $NOVA_DIR/etc/nova/api-paste.ini $NOVA_CONF_DIR
  249.  
  250. # For testing v21 is equivalent to v2
  251. if [[ "$NOVA_API_VERSION" == "v21default" ]]; then
  252. @@ -542,7 +542,7 @@ function create_nova_conf {
  253.  
  254. function init_nova_cells {
  255. if is_service_enabled n-cell; then
  256. - cp $NOVA_CONF $NOVA_CELLS_CONF
  257. + sudo cp $NOVA_CONF $NOVA_CELLS_CONF
  258. iniset $NOVA_CELLS_CONF database connection `database_connection_url $NOVA_CELLS_DB`
  259. iniset $NOVA_CELLS_CONF DEFAULT rabbit_virtual_host child_cell
  260. iniset $NOVA_CELLS_CONF DEFAULT dhcpbridge_flagfile $NOVA_CELLS_CONF
  261. diff --git a/stack.sh b/stack.sh
  262. index 5cdcbdf..85fa11d 100755
  263. --- a/stack.sh
  264. +++ b/stack.sh
  265. @@ -969,6 +969,7 @@ if is_service_enabled keystone; then
  266. echo_summary "Starting Keystone"
  267.  
  268. if [ "$KEYSTONE_AUTH_HOST" == "$SERVICE_HOST" ]; then
  269. + sudo chown stack:stack /etc/keystone/keystone.conf
  270. init_keystone
  271. start_keystone
  272. fi
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement
Public Pastes
Advertisement
We use cookies for various purposes including analytics. By continuing to use Pastebin, you agree to our use of cookies as described in the Cookies Policy.  OK, I Understand
Not a member of Pastebin yet?
Sign Up, it unlocks many cool features!