From 81e48e7b488c15516503b2b08f087f4a7ae9a673 Mon Sep 17 00:00:00 2001 From: zhangzs Date: Mon, 11 Jun 2018 20:23:28 +0800 Subject: [PATCH] replace http with https Change-Id: Ie669500ceaed7c0d48ec0691e11b623d3aad90b2 --- playbooks/roles/bifrost-create-dib-image/README.md | 6 +++--- playbooks/roles/bifrost-ironic-install/defaults/main.yml | 6 +++--- playbooks/roles/ironic-enroll-dynamic/README.md | 2 +- .../notes/bifrost-role-auth-support-ea6b5571cd339aa2.yaml | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/playbooks/roles/bifrost-create-dib-image/README.md b/playbooks/roles/bifrost-create-dib-image/README.md index c5694568c..36875d8d1 100644 --- a/playbooks/roles/bifrost-create-dib-image/README.md +++ b/playbooks/roles/bifrost-create-dib-image/README.md @@ -22,7 +22,7 @@ build_ramdisk: false The dib_env_vars are settings for the diskimage-builder environment variables which allow settings to be passed to elements that are being utilized to build a disk image. More information on diskimage-builder can be found at: -http://git.openstack.org/cgit/openstack/diskimage-builder/ +https://git.openstack.org/cgit/openstack/diskimage-builder/ dib_env_vars: DIB_CLOUD_INIT_DATASOURCES: "ConfigDrive" @@ -43,7 +43,7 @@ dib_elements: "vm enable-serial-console" dib_init_element is used to set the init tool that will be used to provision the installed OS. This is an argument that is passed to -[diskimage-builder](http://docs.openstack.org/developer/diskimage-builder/) +[diskimage-builder](https://docs.openstack.org/developer/diskimage-builder/) which generates a deployable image of the OS defined in 'dib_os_element'. By default we use 'simple-init'. You can modify this to use other init tools, for example: cloud-init (see below) @@ -96,7 +96,7 @@ Using cloud-init By default, bifrost uses the 'simple-init' dib element, which will disable cloud-init. If you have cloud-init enabled in your image(Ubuntu/Fedora) and you wish to allow configdrive to work with it, you set 'dib_init_element' to -['cloud-init-datasources'](http://docs.openstack.org/developer/diskimage-builder/elements/cloud-init-datasources/README.html). +['cloud-init-datasources'](https://docs.openstack.org/developer/diskimage-builder/elements/cloud-init-datasources/README.html). Example Playbook ---------------- diff --git a/playbooks/roles/bifrost-ironic-install/defaults/main.yml b/playbooks/roles/bifrost-ironic-install/defaults/main.yml index 45ac68324..f44417dd5 100644 --- a/playbooks/roles/bifrost-ironic-install/defaults/main.yml +++ b/playbooks/roles/bifrost-ironic-install/defaults/main.yml @@ -38,7 +38,7 @@ ans_network_interface: "{{ network_interface | replace('-', '_') }}" # without TLS. This setting allows a user to override the setting in case # the local webserver has been updated to support HTTPS. # Note: Users wishing to leverage HTTPS should reference the iPXE -# documentation at http://ipxe.org/crypto +# documentation at https://ipxe.org/crypto ipa_file_protocol: "http" ipa_upstream_release: "master" @@ -58,7 +58,7 @@ deploy_image: "{{http_boot_folder}}/{{deploy_image_filename}}" use_cirros: false # Download IPA by default download_ipa: true -cirros_deploy_image_upstream_url: http://download.cirros-cloud.net/0.3.4/cirros-0.3.4-x86_64-disk.img +cirros_deploy_image_upstream_url: https://download.cirros-cloud.net/0.3.4/cirros-0.3.4-x86_64-disk.img # By default bifrost will deploy dnsmasq to utilize as an integrated DHCP # server. If you already have a DHCP server, you will need to disable # this setting, and perform manual configuration of your DHCP server. @@ -87,7 +87,7 @@ upper_constraints_file: "{{ lookup('env', 'UPPER_CONSTRAINTS_FILE') | default(re staging_drivers_git_folder: /opt/stack/ironic-staging-drivers ironicinspector_git_folder: /opt/stack/ironic-inspector ironicinspectorclient_git_folder: /opt/stack/python-ironic-inspector-client -staging_drivers_git_url: http://git.openstack.org/cgit/openstack/ironic-staging-drivers +staging_drivers_git_url: https://git.openstack.org/cgit/openstack/ironic-staging-drivers # TODO(TheJulia): Add redfish to this list. enabled_hardware_types: "ipmi,ilo,cisco-ucs-managed" diff --git a/playbooks/roles/ironic-enroll-dynamic/README.md b/playbooks/roles/ironic-enroll-dynamic/README.md index 2aba67ede..4275d11e5 100644 --- a/playbooks/roles/ironic-enroll-dynamic/README.md +++ b/playbooks/roles/ironic-enroll-dynamic/README.md @@ -31,7 +31,7 @@ ipa_file_protocol: The protocol to utilize to access IPA files. The default is this setting allows a user to change that default if they they have a modified local webserver configuration. Do note, that a user wishing to utilize HTTPS may wish to - review the iPXE documentation: http://ipxe.org/crypto + review the iPXE documentation: https://ipxe.org/crypto noauth_mode: Controls if the module is called in noauth mode. By default, this is the standard mode of operation, diff --git a/releasenotes/notes/bifrost-role-auth-support-ea6b5571cd339aa2.yaml b/releasenotes/notes/bifrost-role-auth-support-ea6b5571cd339aa2.yaml index 343e1b5d4..4e559a176 100644 --- a/releasenotes/notes/bifrost-role-auth-support-ea6b5571cd339aa2.yaml +++ b/releasenotes/notes/bifrost-role-auth-support-ea6b5571cd339aa2.yaml @@ -6,7 +6,7 @@ features: via os-client-config. The role defaults ultimately remain unchanged and default to noauth mode. More information on os-client-config can be found at - http://docs.openstack.org/developer/os-client-config/ + https://docs.openstack.org/developer/os-client-config/ issues: - Users wishing to utilize authentication without leveraging os-client-config, will need to manually update the playbooks